From: HONDA Hirofumi <honda.hirofumi@nttcom.co.jp>
Date: Sat, 3 Mar 2012 23:50:50 +0000 (-0700)
Subject: Bug 3502: client timeout uses server-side read_timeout, not request_timeout
X-Git-Tag: SQUID_3_1_20~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91d1246b3cbc2bbb0bb73f0f675a0fb73280a3fc;p=thirdparty%2Fsquid.git

Bug 3502: client timeout uses server-side read_timeout, not request_timeout

Also adjusts request_timeout description in squid.conf to clarify that
request_timeout applies to receiving complete HTTP request headers and not
just the first header byte or body. We reset the connection timeout to
clientLifetimeTimeout after parsing request headers.

https_port was correctly using Config.Timeout.request already.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 25cd11f041..ae9d7f53ee 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4113,7 +4113,7 @@ TYPE: time_t
 LOC: Config.Timeout.request
 DEFAULT: 5 minutes
 DOC_START
-	How long to wait for an HTTP request after initial
+	How long to wait for complete HTTP request headers after initial
 	connection establishment.
 DOC_END
 
diff --git a/src/client_side.cc b/src/client_side.cc
index d156b88f9c..596e6ea2ea 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3161,7 +3161,7 @@ httpAccept(int sock, int newfd, ConnectionDetail *details,
     typedef CommCbMemFunT<ConnStateData, CommTimeoutCbParams> TimeoutDialer;
     AsyncCall::Pointer timeoutCall =  JobCallback(33, 5,
                                       TimeoutDialer, connState, ConnStateData::requestTimeout);
-    commSetTimeout(newfd, Config.Timeout.read, timeoutCall);
+    commSetTimeout(newfd, Config.Timeout.request, timeoutCall);
 
 #if USE_IDENT
     if (Ident::TheConfig.identLookup) {