removed cache_stoplist_pattern and associated code

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 6677fd676d6add0562219afd3515d1d6a805d827..6c0f4731de227cfd485b93bc59c0adef7365b191 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.280 1998/05/01 17:37:13 wessels Exp $
+ * $Id: cache_cf.cc,v 1.281 1998/05/01 21:09:55 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1149,30 +1149,6 @@ free_refreshpattern(refresh_t ** head)
     }
 }
 
-static void
-dump_regexlist(StoreEntry * entry, const char *name, relist * var)
-{
-    storeAppendPrintf(entry, "%s", name);
-    while (var != NULL) {
-       storeAppendPrintf(entry, " %s", var->pattern);
-       var = var->next;
-    }
-    storeAppendPrintf(entry, "\n");
-}
-
-static void
-parse_regexlist(relist ** var)
-{
-    aclParseRegexList(var);
-}
-
-static void
-free_regexlist(relist ** var)
-{
-    aclDestroyRegexList(*var);
-    *var = NULL;
-}
-
 static void
 dump_string(StoreEntry * entry, const char *name, char *var)
 {

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 3eb1c179abd874b1863e29d8b40f731e925bd4f8..ab5ca68b51d85a538ecdbd8ec207b67000cfefea 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -341,18 +341,6 @@ acl QUERY urlpath_regex cgi-bin \?
 no_cache deny QUERY
 DOC_END
 
-NAME: cache_stoplist_pattern
-TYPE: regexlist
-LOC: Config.cache_stop_relist
-DEFAULT: none
-DOC_START
-       Just like 'cache_stoplist' but you can use regular expressions
-       instead of simple string matching.  There is no default.
-       Insert -i to get case-insensitive regular expressions.
-
-cache_stoplist_pattern
-DOC_END
-
 
 COMMENT_START
  OPTIONS WHICH AFFECT THE CACHE SIZE

diff --git a/src/client_side.cc b/src/client_side.cc
index 5f55fa94c40f7747c0ccf1159fa9f04e5e9c8f47..339c357a1fb6a4bc62e75a431667549d53b48433 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.294 1998/04/27 19:55:10 wessels Exp $
+ * $Id: client_side.cc,v 1.295 1998/05/01 21:09:57 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -872,9 +872,6 @@ clientCachable(clientHttpRequest * http)
      */
     if (!aclCheckFast(Config.accessList.noCache, &ch))
        return 0;
-    if (Config.cache_stop_relist)
-       if (aclMatchRegex(Config.cache_stop_relist, url))
-           return 0;
     if (req->protocol == PROTO_HTTP)
        return httpCachable(method);
     /* FTP is always cachable */