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 425c6dfd0cf59e84f09818ebe6cc14693337e235..19caef4754a5d353990dc5170c69b8eddbaf57d5 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4644,7 +4644,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 2b9d35adbf2dbc68427c73cdb34e7691c199b486..28a94d8d8df8af2a25fce078750f316857420545 100644 (file)
--- 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();