diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 22:03:12 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 22:03:12 +0000 |
| commit | 58a496f954596fc8720777c14213f4a35533147e (patch) | |
| tree | 65b4220a7f685e08eab9a94d73629f6405e59a73 /net/socket/ssl_client_socket_pool.h | |
| parent | 4d299ea9d1a3d8a582cc96bf8efb5e84f09b77d7 (diff) | |
| download | chromium_src-58a496f954596fc8720777c14213f4a35533147e.zip chromium_src-58a496f954596fc8720777c14213f4a35533147e.tar.gz chromium_src-58a496f954596fc8720777c14213f4a35533147e.tar.bz2 | |
Revert 54405 - Fix late binding induced mismatch of Socket and AuthController
[Reason for revert: large spike in crash rate on reliability bots]
ClientSocketPool treats all pending SocketParams as interchangeable. Therefore they can not contain any connection specific data. This only affects the Http Proxy tunnel case. The lowest risk change to fix this problem is to create the HttpAuthController in the HttpProxyClientSocket. If we get a 407 and need to restart the Tunnel, the pending HttpProxyClientSocket is returned to the HttpNetworkTransaction in the additional error state of the connection and then complete the auth in a pair of states in the HttpNetworkTransaction. This reintroduces a dependency between tunnel setup and the HttpNetworkTransaction, but that will need to be fixed at a later date.
BUG=49493,50822
TEST=existing unit tests + manually visiting many SSL sites through a kerberized http proxy.
Review URL: http://codereview.chromium.org/3058013
TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/3056040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.h')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index 9857c61..b44985f 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -44,7 +44,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> { bool want_spdy_over_npn); const scoped_refptr<TCPSocketParams>& tcp_params() { return tcp_params_; } - const scoped_refptr<HttpProxySocketParams>& http_proxy_params() { + const scoped_refptr<HttpProxySocketParams>& http_proxy_params () { return http_proxy_params_; } const scoped_refptr<SOCKSSocketParams>& socks_params() { @@ -114,6 +114,8 @@ class SSLConnectJob : public ConnectJob { // Otherwise, it returns a net error code. virtual int ConnectInternal(); + void DetermineFirstState(); + void OnIOComplete(int result); // Runs the state transition loop. |