Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an...

net/socket/ssl_client_socket_pool.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket_pool.h"
 
 #include "net/base/net_errors.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 
@@ skipping 83 matching lines @@
     case STATE_SSL_CONNECT:
     case STATE_SSL_CONNECT_COMPLETE:
       return LOAD_STATE_SSL_HANDSHAKE;
     default:
       NOTREACHED();
       return LOAD_STATE_IDLE;
   }
 }
 
 int SSLConnectJob::ConnectInternal() {
-  DetermineFirstState();
-  return DoLoop(OK);
-}
-
-void SSLConnectJob::DetermineFirstState() {
   switch (params_->proxy()) {
     case ProxyServer::SCHEME_DIRECT:
       next_state_ = STATE_TCP_CONNECT;
       break;
     case ProxyServer::SCHEME_HTTP:
       next_state_ = STATE_TUNNEL_CONNECT;
       break;
     case ProxyServer::SCHEME_SOCKS4:
     case ProxyServer::SCHEME_SOCKS5:
       next_state_ = STATE_SOCKS_CONNECT;
       break;
     default:
       NOTREACHED() << "unknown proxy type";
       break;
   }
+  return DoLoop(OK);
 }
 
 void SSLConnectJob::OnIOComplete(int result) {
   int rv = DoLoop(result);
   if (rv != ERR_IO_PENDING)
     NotifyDelegateOfCompletion(rv);  // Deletes |this|.
 }
 
 int SSLConnectJob::DoLoop(int result) {
   DCHECK_NE(next_state_, STATE_NONE);
@@ skipping 71 matching lines @@
 int SSLConnectJob::DoSOCKSConnectComplete(int result) {
   if (result == OK)
     next_state_ = STATE_SSL_CONNECT;
 
   return result;
 }
 
 int SSLConnectJob::DoTunnelConnect() {
   DCHECK(http_proxy_pool_.get());
   next_state_ = STATE_TUNNEL_CONNECT_COMPLETE;
+
   transport_socket_handle_.reset(new ClientSocketHandle());
   scoped_refptr<HttpProxySocketParams> http_proxy_params =
       params_->http_proxy_params();
   return transport_socket_handle_->Init(
       group_name(), http_proxy_params,
       http_proxy_params->tcp_params()->destination().priority(), &callback_,
       http_proxy_pool_, net_log());
 }
 
 int SSLConnectJob::DoTunnelConnectComplete(int result) {
   ClientSocket* socket = transport_socket_handle_->socket();
   HttpProxyClientSocket* tunnel_socket =
       static_cast<HttpProxyClientSocket*>(socket);
 
-  if (result == ERR_RETRY_CONNECTION) {
-    DetermineFirstState();
-    transport_socket_handle_->socket()->Disconnect();
-    return OK;
-  }
-
   // Extract the information needed to prompt for the proxy authentication.
   // so that when ClientSocketPoolBaseHelper calls |GetAdditionalErrorState|,
   // we can easily set the state.
   if (result == ERR_PROXY_AUTH_REQUESTED)
     error_response_info_ = *tunnel_socket->GetResponseInfo();
 
   if (result < 0)
     return result;
 
-  if (tunnel_socket->NeedsRestartWithAuth()) {
-    // We must have gotten an 'idle' tunnel socket that is waiting for auth.
-    // The HttpAuthController should have new credentials, we just need
-    // to retry.
-    next_state_ = STATE_TUNNEL_CONNECT_COMPLETE;
-    return tunnel_socket->RestartWithAuth(&callback_);
-  }
-
+  DCHECK(tunnel_socket->IsConnected());
   next_state_ = STATE_SSL_CONNECT;
   return result;
 }
 
 void SSLConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) {
-  handle->set_ssl_error_response_info(error_response_info_);
+  if (error_response_info_.headers) {
+    handle->set_ssl_error_response_info(error_response_info_);
+    handle->set_pending_http_proxy_connection(
+        transport_socket_handle_.release());
+  }
   if (!ssl_connect_start_time_.is_null())
     handle->set_is_ssl_error(true);
 }
 
 int SSLConnectJob::DoSSLConnect() {
   next_state_ = STATE_SSL_CONNECT_COMPLETE;
   // Reset the timeout to just the time allowed for the SSL handshake.
   ResetTimer(base::TimeDelta::FromSeconds(kSSLHandshakeTimeoutInSeconds));
   ssl_connect_start_time_ = base::TimeTicks::Now();
 
@@ skipping 149 matching lines @@
     const std::string& group_name) const {
   return base_.IdleSocketCountInGroup(group_name);
 }
 
 LoadState SSLClientSocketPool::GetLoadState(
     const std::string& group_name, const ClientSocketHandle* handle) const {
   return base_.GetLoadState(group_name, handle);
 }
 
 }  // namespace net