removed {http,ftp,gopher}_stop stoplists

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 19bdd04b1cff37e1d79dbfab4f8ffea1d519a9ae..21bfa8d0a6bdb4f2d9a04a37ae75a94d855758d4 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.64 1996/07/25 07:10:27 wessels Exp $
+ * $Id: cache_cf.cc,v 1.65 1996/07/26 17:18:21 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -780,31 +780,6 @@ static void parseIPLine(list)
     }
 }
 
-static void parseHttpStopLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == NULL)
-       return;
-    wordlistAdd(&Config.http_stoplist, token);
-}
-
-static void parseGopherStopLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == NULL)
-       return;
-    wordlistAdd(&Config.gopher_stoplist, token);
-}
-static void parseFtpStopLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == NULL)
-       return;
-    wordlistAdd(&Config.ftp_stoplist, token);
-}
 static void parseHierarchyStoplistLine()
 {
     char *token;
@@ -1127,18 +1102,6 @@ int parseConfigFile(file_name)
        else if (!strcmp(token, "icp_access"))
            aclParseAccessLine(&ICPAccessList);
 
-       /* Parse a http_stop line */
-       else if (!strcmp(token, "http_stop"))
-           parseHttpStopLine();
-
-       /* Parse a gopher_stop line */
-       else if (!strcmp(token, "gopher_stop"))
-           parseGopherStopLine();
-
-       /* Parse a ftp_stop line */
-       else if (!strcmp(token, "ftp_stop"))
-           parseFtpStopLine();
-
        /* Parse a hierarchy_stoplist line */
        else if (!strcmp(token, "hierarchy_stoplist"))
            parseHierarchyStoplistLine();
@@ -1413,9 +1376,6 @@ static void configFreeMemory()
     safe_free(Config.Announce.host);
     safe_free(Config.Announce.file);
     wordlistDestroy(&Config.cache_dirs);
-    wordlistDestroy(&Config.http_stoplist);
-    wordlistDestroy(&Config.gopher_stoplist);
-    wordlistDestroy(&Config.ftp_stoplist);
     wordlistDestroy(&Config.hierarchy_stoplist);
     wordlistDestroy(&Config.local_domain_list);
     wordlistDestroy(&Config.inside_firewall_list);

diff --git a/src/ftp.cc b/src/ftp.cc
index 437d63bbf5ef5e7e8c156fe69d66bde2e90e17c4..09f259faf232eb0315d5c589437a7d2fb736a6ca 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.48 1996/07/25 07:10:34 wessels Exp $
+ * $Id: ftp.cc,v 1.49 1996/07/26 17:18:21 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -183,21 +183,6 @@ static void ftp_login_parser(login, data)
     }
 }
 
-int ftpCachable(url)
-     char *url;
-{
-    wordlist *p = NULL;
-
-    /* scan stop list */
-    for (p = Config.ftp_stoplist; p; p = p->next) {
-       if (strstr(url, p->key))
-           return 0;
-    }
-
-    /* else cachable */
-    return 1;
-}
-
 /* This will be called when socket lifetime is expired. */
 void ftpLifetimeExpire(fd, data)
      int fd;

diff --git a/src/gopher.cc b/src/gopher.cc
index 8c04c1d6292beb44ac4368b2498cbe40595de893..92e10348cd1ee2cda9a3ed680c5b0eca7bf1a31c 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: gopher.cc,v 1.37 1996/07/25 07:10:34 wessels Exp $
+ * $Id: gopher.cc,v 1.38 1996/07/26 17:18:23 wessels Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -321,15 +321,9 @@ int gopher_url_parser(url, host, port, type_id, request)
 int gopherCachable(url)
      char *url;
 {
-    wordlist *p = NULL;
     GopherData *data = NULL;
     int cachable = 1;
 
-    /* scan stop list */
-    for (p = Config.gopher_stoplist; p; p = p->next)
-       if (strstr(url, p->key))
-           return 0;
-
     /* use as temp data structure to parse gopher URL */
     data = CreateGopherData();
 

diff --git a/src/http.cc b/src/http.cc
index 8d96e164cbcee6d5f584c1b25188e5508d05d336..f584d37c5bb744a98ac742dfadb29b00e97e43d9 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.66 1996/07/25 07:10:35 wessels Exp $
+ * $Id: http.cc,v 1.67 1996/07/26 17:18:23 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -148,18 +148,9 @@ int httpCachable(url, method)
      char *url;
      int method;
 {
-    wordlist *p = NULL;
-
     /* GET and HEAD are cachable. Others are not. */
     if (method != METHOD_GET && method != METHOD_HEAD)
        return 0;
-
-    /* scan stop list */
-    for (p = Config.http_stoplist; p; p = p->next) {
-       if (strstr(url, p->key))
-           return 0;
-    }
-
     /* else cachable */
     return 1;
 }

diff --git a/src/stat.cc b/src/stat.cc
index 990a80c668b0957d11c549eea14e385302517b62..24dc7c6d5d217fa69655a545e666003bec598812 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stat.cc,v 1.49 1996/07/26 17:00:35 wessels Exp $
+ * $Id: stat.cc,v 1.50 1996/07/26 17:18:26 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -622,7 +622,6 @@ void info_get(obj, sentry)
      StoreEntry *sentry;
 {
     char *tod = NULL;
-    wordlist *p = NULL;
     float f;
 #ifdef HAVE_MALLINFO
     int t;
@@ -729,28 +728,6 @@ void info_get(obj, sentry)
     storeAppendPrintf(sentry, "{\tReserved number of file descriptors:  %4d}\n",
        RESERVED_FD);
 
-    storeAppendPrintf(sentry, "{Stop List:}\n");
-    if ((p = Config.http_stoplist)) {
-       storeAppendPrintf(sentry, "{\tHTTP:}\n");
-       while (p) {
-           storeAppendPrintf(sentry, "{\t\t%s}\n", p->key);
-           p = p->next;
-       }
-    }
-    if ((p = Config.gopher_stoplist)) {
-       storeAppendPrintf(sentry, "{\tGOPHER:}\n");
-       while (p) {
-           storeAppendPrintf(sentry, "{\t\t%s}\n", p->key);
-           p = p->next;
-       }
-    }
-    if ((p = Config.ftp_stoplist)) {
-       storeAppendPrintf(sentry, "{\tFTP:}\n");
-       while (p) {
-           storeAppendPrintf(sentry, "{\t\t%s}\n", p->key);
-           p = p->next;
-       }
-    }
     storeAppendPrintf(sentry, "{Internal Data Structures:}\n");
     storeAppendPrintf(sentry, "{\tHot Object Cache Items %d}\n",
        meta_data.hot_vm);