| Index: net/socket/ssl_client_socket_pool.cc
|
| ===================================================================
|
| --- net/socket/ssl_client_socket_pool.cc (revision 68026)
|
| +++ net/socket/ssl_client_socket_pool.cc (working copy)
|
| @@ -260,7 +260,12 @@
|
| ClientSocket* socket = transport_socket_handle_->socket();
|
| HttpProxyClientSocket* tunnel_socket =
|
| static_cast<HttpProxyClientSocket*>(socket);
|
| - error_response_info_ = *tunnel_socket->GetResponseInfo();
|
| + error_response_info_ = *tunnel_socket->GetConnectResponseInfo();
|
| + } else if (result == ERR_HTTPS_PROXY_TUNNEL_CONNECTION_RESPONSE) {
|
| + error_response_info_ = transport_socket_handle_->ssl_error_response_info();
|
| + pending_https_proxy_response_stream_.reset(
|
| + transport_socket_handle_->
|
| + release_pending_https_proxy_response_stream());
|
| }
|
| if (result < 0)
|
| return result;
|
| @@ -277,6 +282,9 @@
|
| transport_socket_handle_.release());
|
| }
|
| handle->set_ssl_error_response_info(error_response_info_);
|
| + if (pending_https_proxy_response_stream_.get())
|
| + handle->set_pending_https_proxy_response_stream(
|
| + pending_https_proxy_response_stream_.release());
|
| if (!ssl_connect_start_time_.is_null())
|
| handle->set_is_ssl_error(true);
|
| }
|
|
|