diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 18:29:11 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 18:29:11 +0000 |
| commit | e9fa548ae756b22349f92400617dcdd07f231df3 (patch) | |
| tree | 36669fa3bf2cd9acdd6a60bfdd037ba9c1420978 /net | |
| parent | 22520265348d1a6e610397ab952229e52faf4125 (diff) | |
| download | chromium_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')
| -rw-r--r-- | net/http/http_proxy_client_socket.cc | 3 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool_unittest.cc | 3 | ||||
| -rw-r--r-- | net/spdy/spdy_proxy_client_socket.cc | 2 | ||||
| -rw-r--r-- | net/spdy/spdy_proxy_client_socket_unittest.cc | 2 |
4 files changed, 6 insertions, 4 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), diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index febd4c4..fc4b2ed 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -95,7 +95,8 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam { void AddAuthToCache() { const string16 kFoo(ASCIIToUTF16("foo")); const string16 kBar(ASCIIToUTF16("bar")); - session_->http_auth_cache()->Add(GURL("http://proxy/"), + GURL proxy_url(GetParam() == HTTP ? "http://proxy" : "https://proxy:80"); + session_->http_auth_cache()->Add(proxy_url, "MyRealm1", HttpAuth::AUTH_SCHEME_BASIC, "Basic realm=MyRealm1", 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"; |