diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 18:11:13 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 18:11:13 +0000 |
| commit | e772db3f04f1079a07d702c6aa4e0394f2147af9 (patch) | |
| tree | edfe7bec726506679a8163fb4fd207287c8df77d /net/socket/client_socket_handle.cc | |
| parent | 1e89e05c0bae9404547e95b86cce02d233706f28 (diff) | |
| download | chromium_src-e772db3f04f1079a07d702c6aa4e0394f2147af9.zip chromium_src-e772db3f04f1079a07d702c6aa4e0394f2147af9.tar.gz chromium_src-e772db3f04f1079a07d702c6aa4e0394f2147af9.tar.bz2 | |
Put HttpProxyClientSocket into a pool.
This CL requires http://codereview.chromium.org/2799036
- Cleanup the HttpProxyClientSocket interface a touch.
- Make HttpAuthController reference counted.
- Enable ClientSocketPool to return recoverable connections.
BUG=42795
TEST=existing unit tests
Review URL: http://codereview.chromium.org/2817033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_handle.cc')
| -rw-r--r-- | net/socket/client_socket_handle.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc index 4adae02..fab8d3e 100644 --- a/net/socket/client_socket_handle.cc +++ b/net/socket/client_socket_handle.cc @@ -73,7 +73,8 @@ void ClientSocketHandle::OnIOComplete(int result) { void ClientSocketHandle::HandleInitCompletion(int result) { CHECK_NE(ERR_IO_PENDING, result); if (result != OK) { - ResetInternal(false); // The request failed, so there's nothing to cancel. + if (!socket_.get()) + ResetInternal(false); // Nothing to cancel since the request failed. return; } CHECK_NE(-1, pool_id_) << "Pool should have set |pool_id_| to a valid value."; |