From: HONDA Hirofumi <honda.hirofumi@nttcom.co.jp>
Date: Tue, 28 Feb 2012 17:52:21 +0000 (-0700)
Subject: Bug 3502: client timeout uses server-side read_timeout, not request_timeout
X-Git-Tag: BumpSslServerFirst.take05~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b2a2108882bebc28cc5a783d1bb4fd4d8cf553f;p=thirdparty%2Fsquid.git

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

I have also adjusted 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. 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 d432309843..c94c06080a 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4646,7 +4646,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 2b9d35adbf..28a94d8d8d 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3233,7 +3233,7 @@ httpAccept(const CommAcceptCbParams &params)
     typedef CommCbMemFunT<ConnStateData, CommTimeoutCbParams> TimeoutDialer;
     AsyncCall::Pointer timeoutCall =  JobCallback(33, 5,
                                       TimeoutDialer, connState, ConnStateData::requestTimeout);
-    commSetConnTimeout(params.conn, Config.Timeout.read, timeoutCall);
+    commSetConnTimeout(params.conn, Config.Timeout.request, timeoutCall);
 
     connState->readSomeData();