Split pconn timeouts in server and client timeouts.

request_timeout			initial client request
persistent_request_timeout	persistent connection request timeout
pconn_timeout			server idle connection timeout

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 4304cd9fcb01804313fe1b98df1a4ba93151a259..6327aeae0fc4e623b2034ee2e4158a205de50067 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.241 2001/11/23 23:38:52 hno Exp $
+# $Id: cf.data.pre,v 1.242 2001/12/01 18:03:10 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1723,11 +1723,20 @@ DOC_END
 NAME: request_timeout
 TYPE: time_t
 LOC: Config.Timeout.request
-DEFAULT: 30 seconds
+DEFAULT: 5 minutes
+DOC_START
+       How long to wait for an HTTP request after initial
+       connection establishment.
+DOC_END
+
+
+NAME: persistent_request_timeout
+TYPE: time_t
+LOC: Config.Timeout.persistent_request
+DEFAULT: 1 minute
 DOC_START
-       How long to wait for an HTTP request after connection
-       establishment.  For persistent connections, wait this long
-       after the previous request completes.
+       How long to wait for the next HTTP request on a persistent
+       connection after the previous request completes.
 DOC_END
 
 
@@ -1750,7 +1759,7 @@ DOC_START
        should probably change client_lifetime only as a last resort.
        If you seem to have many client connections tying up
        filedescriptors, we recommend first tuning the read_timeout,
-       request_timeout, pconn_timeout and quick_abort values.
+       request_timeout, persistent_request_timeout and quick_abort values.
 DOC_END
 
 NAME: half_closed_clients

diff --git a/src/client_side.cc b/src/client_side.cc
index 6559ff7de4f26e01de724110b19a70d50235572f..700ca6f55f67a7f223b297c784de7304c88f3b7f 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.559 2001/11/18 10:20:28 hno Exp $
+ * $Id: client_side.cc,v 1.560 2001/12/01 18:03:10 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2023,7 +2023,7 @@ clientKeepaliveNextRequest(clientHttpRequest * http)
        /*
         * Set the timeout BEFORE calling clientReadRequest().
         */
-       commSetTimeout(conn->fd, Config.Timeout.pconn, requestTimeout, conn);
+       commSetTimeout(conn->fd, Config.Timeout.persistent_request, requestTimeout, conn);
        /*
         * CYGWIN has a problem and is blocking on read() requests when there
         * is no data present.

diff --git a/src/structs.h b/src/structs.h
index 8bf225269df2b80878bd7b704ebe45a730d0bcb8..0151ca99630008b5f0c252a833e30abe36454915 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.407 2001/10/24 07:45:35 hno Exp $
+ * $Id: structs.h,v 1.408 2001/12/01 18:03:10 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -397,6 +397,7 @@ struct _SquidConfig {
        time_t connect;
        time_t peer_connect;
        time_t request;
+       time_t persistent_request;
        time_t pconn;
        time_t siteSelect;
        time_t deadPeer;