From 077f431d8dda713756d63e56244e83663e880825 Mon Sep 17 00:00:00 2001 From: "bengr@chromium.org" Date: Fri, 10 May 2013 03:48:06 +0000 Subject: Timeout HTTP proxy connect jobs faster on iOS BUG=239514 Review URL: https://chromiumcodereview.appspot.com/14969011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199363 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_proxy_client_socket_pool.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 9d6540d..3c38c15 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -68,7 +68,7 @@ HttpProxySocketParams::~HttpProxySocketParams() {} // HttpProxyConnectJobs will time out after this many seconds. Note this is on // top of the timeout for the transport socket. -#if defined(OS_ANDROID) && defined(SPDY_PROXY_AUTH_ORIGIN) +#if (defined(OS_ANDROID) || defined(OS_IOS)) && defined(SPDY_PROXY_AUTH_ORIGIN) static const int kHttpProxyConnectJobTimeoutInSeconds = 10; #else static const int kHttpProxyConnectJobTimeoutInSeconds = 30; @@ -366,7 +366,8 @@ HttpProxyConnectJobFactory::HttpProxyConnectJobFactory( net_log_(net_log) { base::TimeDelta max_pool_timeout = base::TimeDelta(); -#if !defined(OS_ANDROID) || !defined(SPDY_PROXY_AUTH_ORIGIN) +#if (defined(OS_ANDROID) || defined(OS_IOS)) && defined(SPDY_PROXY_AUTH_ORIGIN) +#else if (transport_pool_) max_pool_timeout = transport_pool_->ConnectionTimeout(); if (ssl_pool_) -- cgit v1.1