summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket_pool.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
-rw-r--r--net/http/http_proxy_client_socket_pool.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 42722d2..13f4519 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -155,7 +155,7 @@ int HttpProxyConnectJob::DoTCPConnect() {
int HttpProxyConnectJob::DoTCPConnectComplete(int result) {
if (result != OK)
- return result;
+ return ERR_PROXY_CONNECTION_FAILED;
// Reset the timer to just the length of time allowed for HttpProxy handshake
// so that a fast TCP connection plus a slow HttpProxy failure doesn't take
@@ -180,6 +180,8 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {
params_->ssl_params()->load_flags() & LOAD_IGNORE_ALL_CERT_ERRORS)
result = OK;
if (result < 0) {
+ // TODO(eroman): return ERR_PROXY_CONNECTION_FAILED if failed with the
+ // TCP connection.
if (transport_socket_handle_->socket())
transport_socket_handle_->socket()->Disconnect();
return result;