From: wessels <>
Date: Wed, 2 Jul 2003 02:42:27 +0000 (+0000)
Subject: Removed 'minimum_retry_timeout' and Config.retry.timeout.  This
X-Git-Tag: SQUID_3_0_PRE1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3d553215678485e59b81968c9d6a979a19c6237;p=thirdparty%2Fsquid.git

Removed 'minimum_retry_timeout' and Config.retry.timeout.  This
variable has not been used for some time it seems.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index e966cccfc6..98199f0a89 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.443 2003/06/09 05:09:34 robertc Exp $
+ * $Id: cache_cf.cc,v 1.444 2003/07/01 20:42:27 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -472,9 +472,6 @@ configDoConfigure(void)
     safe_free(debug_options)
     debug_options = xstrdup(Config.debugOptions);
 
-    if (Config.retry.timeout < 5)
-        fatal("minimum_retry_timeout must be at least 5 seconds");
-
     if (Config.retry.maxtries > 10)
         fatal("maximum_single_addr_tries cannot be larger than 10");
 
diff --git a/src/cf.data.pre b/src/cf.data.pre
index c0bc6cf8fa..c19ba96c74 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.326 2003/06/27 22:42:08 hno Exp $
+# $Id: cf.data.pre,v 1.327 2003/07/01 20:42:27 wessels Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -3377,28 +3377,6 @@ DOC_START
 	directory and point this tag at them.
 DOC_END
 
-NAME: minimum_retry_timeout
-COMMENT: (seconds)
-TYPE: time_t
-LOC: Config.retry.timeout
-DEFAULT: 5 seconds
-DOC_START
-	This specifies the minimum connect timeout, for when the
-	connect timeout is reduced to compensate for the availability
-	of multiple IP addresses.
-
-	When a connection to a host is initiated, and that host has
-	several IP addresses, the default connection timeout is reduced
-	by dividing it by the number of addresses.  So, a site with 15
-	addresses would then have a timeout of 8 seconds for each
-	address attempted.  To avoid having the timeout reduced to the
-	point where even a working host would not have a chance to
-	respond, this setting is provided.  The default, and the
-	minimum value, is five seconds, and the maximum value is sixty
-	seconds, or half of connect_timeout, whichever is greater and
-	less than connect_timeout.
-DOC_END
-
 NAME: maximum_single_addr_tries
 TYPE: int
 LOC: Config.retry.maxtries
diff --git a/src/structs.h b/src/structs.h
index 0678e21ba1..ad999f6dac 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.466 2003/06/27 22:32:31 hno Exp $
+ * $Id: structs.h,v 1.467 2003/07/01 20:42:28 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -630,7 +630,6 @@ struct _SquidConfig
 
     struct
     {
-        time_t timeout;
         int maxtries;
     }