diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 16:29:08 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 16:29:08 +0000 |
| commit | 9b40b28c0598ca9fa968e69b5da4be8c2d16f115 (patch) | |
| tree | a61576c20105b80a40976ba4563d266b4eef7de7 /net/socket/ssl_client_socket_pool_unittest.cc | |
| parent | c0b656408d922a6a4a795e8912342f3ead0465ae (diff) | |
| download | chromium_src-9b40b28c0598ca9fa968e69b5da4be8c2d16f115.zip chromium_src-9b40b28c0598ca9fa968e69b5da4be8c2d16f115.tar.gz chromium_src-9b40b28c0598ca9fa968e69b5da4be8c2d16f115.tar.bz2 | |
Revert 57333 - Add support for speaking SSL to an HTTP Proxy, to
HttpProxyClientSocketPool (and friends)
Reverting due to heapcheck issues:
http://build.chromium.org/buildbot/memory/builders/Linux%20Heapcheck/builds/7039/steps/heapcheck%20test:%20net/logs/stdio
Suppression:
{
<insert_a_suppression_name_here>
Heapcheck:Leak
fun:RefCountedBase
fun:RefCounted
fun:TCPSocketParams
fun:net::HttpStreamRequest::DoInitConnection
fun:net::HttpStreamRequest::DoLoop
fun:net::HttpStreamRequest::RunLoop
fun:net::HttpStreamRequest::Start
fun:net::HttpStreamFactory::RequestStream
fun:net::HttpNetworkTransaction::DoInitStream
fun:net::HttpNetworkTransaction::DoLoop
fun:net::HttpNetworkTransaction::RestartIgnoringLastError
fun:net::HttpNetworkTransactionTest_HTTPSBadCertificateViaHttpsProxy_Test::TestBody
fun:testing::Test::Run
fun:testing::internal::TestInfoImpl::Run
fun:testing::TestCase::Run
fun:testing::internal::UnitTestImpl::RunAllTests
fun:testing::UnitTest::Run
fun:base::TestSuite::Run
fun:main
fun:__libc_start_main
}
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/3110006
TBR=rch@chromium.org
Review URL: http://codereview.chromium.org/3134034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57335 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, 1 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 93ea2de..72c46df 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_, NULL, GURL("http://host"), "", + proxy_tcp_socket_params_, GURL("http://host"), "", HostPortPair("host", 80), session_, true)), http_proxy_socket_pool_(new HttpProxyClientSocketPool( kMaxSockets, @@ -62,7 +62,6 @@ 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), |