From 0e88ad60a68c0be910d458564e1121877e85ee7e Mon Sep 17 00:00:00 2001
From: "willchan@chromium.org"
 <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 4 May 2010 23:47:02 +0000
Subject: Add ssl into the key for ClientSocketPools. I chose to use "ssl"
 instead of "http" and "https" in the connection group string so as not to
 confuse terminology with spdy which will be over ssl. BUG=43218
 TEST=gutschke.com:8888 shouldn't crash

Review URL: http://codereview.chromium.org/1951005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46414 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/http/http_network_transaction.cc          |  3 +++
 net/http/http_network_transaction_unittest.cc | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'net')

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 9a65d13..b0a6ac9 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -755,6 +755,9 @@ int HttpNetworkTransaction::DoInitConnection() {
   connection_group = endpoint_.ToString();
   DCHECK(!connection_group.empty());
 
+  if (using_ssl_)
+    connection_group = StringPrintf("ssl/%s", connection_group.c_str());
+
   // If the user is refreshing the page, bypass the host cache.
   bool disable_resolver_cache = request_->load_flags & LOAD_BYPASS_CACHE ||
                                 request_->load_flags & LOAD_DISABLE_CACHE;
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index e0b1bfc..8f0528a 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -3759,17 +3759,17 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForDirectConnections) {
     {
       "",  // unused
       "https://www.google.com/direct_ssl",
-      "www.google.com:443",
+      "ssl/www.google.com:443",
     },
     {
       "",  // unused
       "https://[2001:1418:13:1::25]/direct",
-      "[2001:1418:13:1::25]:443",
+      "ssl/[2001:1418:13:1::25]:443",
     },
     {
       "",  // unused
       "http://host.with.alternate/direct",
-      "host.with.alternate:443",
+      "ssl/host.with.alternate:443",
     },
   };
 
@@ -3805,13 +3805,13 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) {
     {
       "http_proxy",
       "https://www.google.com/http_connect_ssl",
-      "www.google.com:443",
+      "ssl/www.google.com:443",
     },
 
     {
       "http_proxy",
       "http://host.with.alternate/direct",
-      "host.with.alternate:443",
+      "ssl/host.with.alternate:443",
     },
   };
 
@@ -3854,18 +3854,18 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) {
     {
       "socks4://socks_proxy:1080",
       "https://www.google.com/socks4_ssl",
-      "socks4/www.google.com:443",
+      "socks4/ssl/www.google.com:443",
     },
     {
       "socks5://socks_proxy:1080",
       "https://www.google.com/socks5_ssl",
-      "socks5/www.google.com:443",
+      "socks5/ssl/www.google.com:443",
     },
 
     {
       "socks4://socks_proxy:1080",
       "http://host.with.alternate/direct",
-      "socks4/host.with.alternate:443",
+      "socks4/ssl/host.with.alternate:443",
     },
   };
 
-- 
cgit v1.1