diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 01:57:19 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 01:57:19 +0000 |
| commit | e044535c247eb37be5c6311e7bda24aceeb591d7 (patch) | |
| tree | 007e0ae15d508dc09a346f7ec2a4cdc9a45c2afb /net | |
| parent | ac31611f7a3b90472fa77a4eb08b84ece937216d (diff) | |
| download | chromium_src-e044535c247eb37be5c6311e7bda24aceeb591d7.zip chromium_src-e044535c247eb37be5c6311e7bda24aceeb591d7.tar.gz chromium_src-e044535c247eb37be5c6311e7bda24aceeb591d7.tar.bz2 | |
Merge 124970 - net: Disconnect proxy sockets that have a certificate error.
BUG=116398
TEST=Set a SPDY proxy with a certificate error. Ensure that requests always get ERR_PROXY_CERTIFICATE_INVALID, even with several reloads.
Review URL: http://codereview.chromium.org/9600022
TBR=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9616050
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@125285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 7a51717..d3db3af 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -223,6 +223,7 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) { else // TODO(rch): allow the user to deal with proxy cert errors in the // same way as server cert errors. + transport_socket_handle_->socket()->Disconnect(); return ERR_PROXY_CERTIFICATE_INVALID; } if (result < 0) { |