From 91d1246b3cbc2bbb0bb73f0f675a0fb73280a3fc Mon Sep 17 00:00:00 2001 From: HONDA Hirofumi Date: Sat, 3 Mar 2012 16:50:50 -0700 Subject: [PATCH] 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. --- src/cf.data.pre | 2 +- src/client_side.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 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) { -- 2.47.2