Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro...

net/socket/ssl_client_socket_pool.cc

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_->

[vandebo (ex-Chrome), 2010/12/04 00:30:37]

Indeed, you get the pending https proxy response stream from the transport
socket (recoverable error) and not the additional error state.  Since you can't
do the same thing here (the socket would be returned to the wrong pool), maybe
you should always use the additional error state method and not treat the http
proxy client socket non200/407 as a recoverable error.

+            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);
 }