summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket.cc
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/http/http_proxy_client_socket.cc
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/http/http_proxy_client_socket.cc')
-rw-r--r--net/http/http_proxy_client_socket.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 584cecd..1466796 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -42,7 +42,8 @@ HttpProxyClientSocket::HttpProxyClientSocket(
endpoint_(endpoint),
auth_(tunnel ?
new HttpAuthController(HttpAuth::AUTH_PROXY,
- GURL("http://" + proxy_server.ToString()),
+ GURL((is_https_proxy ? "https://" : "http://")
+ + proxy_server.ToString()),
http_auth_cache,
http_auth_handler_factory)
: NULL),