diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:13:46 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:13:46 +0000 |
| commit | 2df19bbe98514cda5a61d0805b62beacd85a85d0 (patch) | |
| tree | 9624087bcdcf85b4e873ea383f63f3a58ff249ce /net/socket/ssl_client_socket_pool_unittest.cc | |
| parent | f5bbc935e2dbf097974ebe48d3ae7e6ef1220d38 (diff) | |
| download | chromium_src-2df19bbe98514cda5a61d0805b62beacd85a85d0.zip chromium_src-2df19bbe98514cda5a61d0805b62beacd85a85d0.tar.gz chromium_src-2df19bbe98514cda5a61d0805b62beacd85a85d0.tar.bz2 | |
Attempting to re-land CL 3110006 which turned out to have
a memory leak.
Add support for speaking SSL to an HTTP Proxy, to
HttpProxyClientSocketPool (and friends)
More information about an HTTPS Proxy can be found here:
http://dev.chromium.org/spdy/spdy-proxy
This implementation supports both http:// and https:// requests,
as well as support for both Proxy and Server auth.
BUG=29625
TEST=none
Review URL: http://codereview.chromium.org/3112034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 72c46df..93ea2de 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -54,7 +54,7 @@ class SSLClientSocketPoolTest : public ClientSocketPoolTest { proxy_tcp_socket_params_(new TCPSocketParams( HostPortPair("proxy", 443), MEDIUM, GURL(), false)), http_proxy_socket_params_(new HttpProxySocketParams( - proxy_tcp_socket_params_, GURL("http://host"), "", + proxy_tcp_socket_params_, NULL, GURL("http://host"), "", HostPortPair("host", 80), session_, true)), http_proxy_socket_pool_(new HttpProxyClientSocketPool( kMaxSockets, @@ -62,6 +62,7 @@ class SSLClientSocketPoolTest : public ClientSocketPoolTest { make_scoped_refptr(new ClientSocketPoolHistograms("MockHttpProxy")), new MockHostResolver, tcp_socket_pool_, + NULL, NULL)), socks_socket_params_(new SOCKSSocketParams( proxy_tcp_socket_params_, true, HostPortPair("sockshost", 443), |