summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-06 02:23:20 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-06 02:23:20 +0000
commite9519556dd6ec6b9961fcf2779131727dc673376 (patch)
tree6d3a5c0bf2f734f6974f1b6cfb80bafab2557c45 /net/socket
parent659a26023ec2ac7100e5c79c29856ef049af6ca3 (diff)
downloadchromium_src-e9519556dd6ec6b9961fcf2779131727dc673376.zip
chromium_src-e9519556dd6ec6b9961fcf2779131727dc673376.tar.gz
chromium_src-e9519556dd6ec6b9961fcf2779131727dc673376.tar.bz2
Increase the timeout for TcpConnectJob from 60 seconds to 240 seconds.
BUG=23364 Review URL: http://codereview.chromium.org/255085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/tcp_client_socket_pool.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/socket/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc
index d73221a..ca92073 100644
--- a/net/socket/tcp_client_socket_pool.cc
+++ b/net/socket/tcp_client_socket_pool.cc
@@ -20,7 +20,14 @@ namespace net {
// TCPConnectJobs will time out after this many seconds. Note this is the total
// time, including both host resolution and TCP connect() times.
-static const int kTCPConnectJobTimeoutInSeconds = 60;
+//
+// TODO(eroman): The use of this constant needs to be re-evaluated. The time
+// needed for TCPClientSocketXXX::Connect() can be arbitrarily long, since
+// the address list may contain many alternatives, and most of those may
+// timeout. Even worse, the per-connect timeout threshold varies greatly
+// between systems (anywhere from 20 seconds to 190 seconds).
+// See comment #12 at http://crbug.com/23364 for specifics.
+static const int kTCPConnectJobTimeoutInSeconds = 240; // 4 minutes.
TCPConnectJob::TCPConnectJob(
const std::string& group_name,