summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 18:29:11 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 18:29:11 +0000
commite9fa548ae756b22349f92400617dcdd07f231df3 (patch)
tree36669fa3bf2cd9acdd6a60bfdd037ba9c1420978 /net/spdy
parent22520265348d1a6e610397ab952229e52faf4125 (diff)
downloadchromium_src-e9fa548ae756b22349f92400617dcdd07f231df3.zip
chromium_src-e9fa548ae756b22349f92400617dcdd07f231df3.tar.gz
chromium_src-e9fa548ae756b22349f92400617dcdd07f231df3.tar.bz2
Change HttpProxyClientSocket and SpdyProxyClient socket to look
for proxy auth as https:// instead of http:// when the proxy is an HTTPS proxy, which corresponds to the correct auth target. BUG=88187 TEST=HttpProxyClientSocketPoolTest.AsyncHaveAuth Review URL: http://codereview.chromium.org/7277070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_proxy_client_socket.cc2
-rw-r--r--net/spdy/spdy_proxy_client_socket_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index c5733cf..5034d44 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -38,7 +38,7 @@ SpdyProxyClientSocket::SpdyProxyClientSocket(
endpoint_(endpoint),
auth_(
new HttpAuthController(HttpAuth::AUTH_PROXY,
- GURL("http://" + proxy_server.ToString()),
+ GURL("https://" + proxy_server.ToString()),
auth_cache,
auth_handler_factory)),
user_buffer_(NULL),
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 2e5ffba..1754a6c 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -31,7 +31,7 @@ static const char kUrl[] = "https://www.google.com/";
static const char kOriginHost[] = "www.google.com";
static const int kOriginPort = 443;
static const char kOriginHostPort[] = "www.google.com:443";
-static const char kProxyUrl[] = "http://myproxy:6121/";
+static const char kProxyUrl[] = "https://myproxy:6121/";
static const char kProxyHost[] = "myproxy";
static const int kProxyPort = 6121;
static const char kUserAgent[] = "Mozilla/1.0";