diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 16:54:17 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 16:54:17 +0000 |
| commit | 86cb56be42fdf682129ee9d7b239e72a41854404 (patch) | |
| tree | 4dcc499882dbf6e9f6f14c744a6c295da57f456d | |
| parent | c22a78801b76bd48268c244824e6d31ee6f7d64e (diff) | |
| download | chromium_src-86cb56be42fdf682129ee9d7b239e72a41854404.zip chromium_src-86cb56be42fdf682129ee9d7b239e72a41854404.tar.gz chromium_src-86cb56be42fdf682129ee9d7b239e72a41854404.tar.bz2 | |
Merge 55154 - Fix crash during SSL client auth
We did not set ssl_error_response_info in all cases, so later error-handling
code was missing objects which it needed.
BUG=51127
TEST=see bug report
Review URL: http://codereview.chromium.org/3015057
TBR=davidben@chromium.org
Review URL: http://codereview.chromium.org/3096009
git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55411 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index a7c5cc9..64cbc53e 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -238,11 +238,13 @@ int SSLConnectJob::DoTunnelConnectComplete(int result) { } void SSLConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { + // Headers in |error_response_info_| indicate a proxy tunnel setup + // problem. See DoTunnelConnectComplete. if (error_response_info_.headers) { - handle->set_ssl_error_response_info(error_response_info_); handle->set_pending_http_proxy_connection( transport_socket_handle_.release()); } + handle->set_ssl_error_response_info(error_response_info_); if (!ssl_connect_start_time_.is_null()) handle->set_is_ssl_error(true); } |