Make the default refresh_pattern merely a suggested default. This is

consistent with older Squid versions due to a bug in the "DEFAULT-IF-NONE"
processing of refresh_pattern.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index b81a0f7868e228341dcf828de3ce7a67f5e50fc2..baa3000c85783f9150a0d130a26b01de00f225de 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.405 2002/04/13 22:25:19 hno Exp $
+ * $Id: cache_cf.cc,v 1.406 2002/04/13 22:30:53 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1899,11 +1899,13 @@ parse_refreshpattern(refresh_t ** head)
     safe_free(pattern);
 }
 
+#if UNUSED_CODE
 static int
 check_null_refreshpattern(refresh_t * data)
 {
     return data == NULL;
 }
+#endif
 
 static void
 free_refreshpattern(refresh_t ** head)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 290a00db2c59bbe4819c37203622cc9357d8f6d2..5b598001d361a6b5c6f547a4ccd2a00dbca03ef5 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.255 2002/04/07 03:35:30 hno Exp $
+# $Id: cf.data.pre,v 1.256 2002/04/13 22:30:53 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1482,9 +1482,6 @@ NAME: refresh_pattern
 TYPE: refreshpattern
 LOC: Config.Refresh
 DEFAULT: none
-DEFAULT_IF_NONE:       ^ftp:           1440    20%     10080
-DEFAULT_IF_NONE:       ^gopher:        1440    0%      1440
-DEFAULT_IF_NONE:       .               0       20%     4320
 DOC_START
        usage: refresh_pattern [-i] regex min percent max [options]
 
@@ -1544,6 +1541,13 @@ DOC_START
        Note, you must uncomment all the default lines if you want
        to change one. The default setting is only active if none is
        used.
+
+Suggested default:
+NOCOMMENT_START
+refresh_pattern ^ftp:          1440    20%     10080
+refresh_pattern ^gopher:       1440    0%      1440
+refresh_pattern .              0       20%     4320
+NOCOMMENT_END
 DOC_END
 
 NAME: reference_age