OS/2 icon tweak

[privoxy.git] / filters.c

diff --git a/filters.c b/filters.c
index c2e7030..6140bb0 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.47 2002/03/13 00:30:52 jongfoster Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.51 2002/03/24 15:23:33 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -12,7 +12,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.47 2002/03/13 00:30:52 jongfoster
  *                   'ijb_send_banner', and `trust_url'
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *                Privoxy team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -38,6 +38,18 @@ const char filters_rcs[] = "$Id: filters.c,v 1.47 2002/03/13 00:30:52 jongfoster
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.51  2002/03/24 15:23:33  jongfoster
+ *    Name changes
+ *
+ *    Revision 1.50  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
+ *    Revision 1.49  2002/03/16 20:29:14  oes
+ *    Cosmetics
+ *
+ *    Revision 1.48  2002/03/13 20:25:34  oes
+ *    Better logging for content filters
+ *
  *    Revision 1.47  2002/03/13 00:30:52  jongfoster
  *    Killing warnings
  *    Added option of always sending redirect for imageblock,
@@ -681,15 +693,15 @@ struct http_response *block_url(struct client_state *csp)
 #if 1 /* Two alternative strategies, use this one for now: */
 
       /* and handle accordingly: */
-      if ((p == NULL) || (0 == strcmpic(p, "logo")))
+      if ((p == NULL) || (0 == strcmpic(p, "pattern")))
       {
-         rsp->body = bindup(image_logo_data, image_logo_length);
+         rsp->body = bindup(image_pattern_data, image_pattern_length);
          if (rsp->body == NULL)
          {
             free_http_response(rsp);
             return cgi_error_memory();
          }
-         rsp->content_length = image_logo_length;
+         rsp->content_length = image_pattern_length;
 
          if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
          {
@@ -715,26 +727,9 @@ struct http_response *block_url(struct client_state *csp)
          }
       }
 
-      else if (0 == strcmpic(p, "pattern"))
-      {
-         rsp->body = bindup(image_pattern_data, image_pattern_length);
-         if (rsp->body == NULL)
-         {
-            free_http_response(rsp);
-            return cgi_error_memory();
-         }
-         rsp->content_length = image_pattern_length;
-
-         if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
-         {
-            free_http_response(rsp);
-            return cgi_error_memory();
-         }
-      }
-
       else
       {
-         rsp->status = strdup("302 Local Redirect from Junkbuster");
+         rsp->status = strdup("302 Local Redirect from Privoxy");
          if (rsp->status == NULL)
          {
             free_http_response(rsp);
@@ -751,19 +746,15 @@ struct http_response *block_url(struct client_state *csp)
 #else /* Following code is disabled for now */
 
       /* and handle accordingly: */
-      if ((p == NULL) || (0 == strcmpic(p, "logo")))
+      if ((p == NULL) || (0 == strcmpic(p, "pattern")))
       {
-         p = CGI_PREFIX "send-banner?type=logo";
+         p = CGI_PREFIX "send-banner?type=pattern";
       }
       else if (0 == strcmpic(p, "blank"))
       {
          p = CGI_PREFIX "send-banner?type=blank";
       }
-      else if (0 == strcmpic(p, "pattern"))
-      {
-         p = CGI_PREFIX "send-banner?type=pattern";
-      }
-      rsp->status = strdup("302 Local Redirect from Junkbuster");
+      rsp->status = strdup("302 Local Redirect from Privoxy");
       if (rsp->status == NULL)
       {
          free_http_response(rsp);
@@ -1036,7 +1027,7 @@ struct http_response *redirect_url(struct client_state *csp)
       }
 
       if ( enlist_unique_header(rsp->headers, "Location", q)
-        || (NULL == (rsp->status = strdup("302 Local Redirect from Junkbuster"))) )
+        || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))) )
       {
          free_http_response(rsp);
          return cgi_error_memory();
@@ -1295,18 +1286,18 @@ char *pcrs_filter_response(struct client_state *csp)
       for (filtername = csp->action->multi[ACTION_MULTI_FILTER]->first;
            filtername ; filtername = filtername->next)
       {
-         if (strcmp(b->filtername, filtername->str) == 0)
+         if (strcmp(b->name, filtername->str) == 0)
          {
             int current_hits = 0;
 
             if ( NULL == b->joblist )
             {
-               log_error(LOG_LEVEL_RE_FILTER, "Filter %s has empty joblist. Nothing to do.", b->filtername);
+               log_error(LOG_LEVEL_RE_FILTER, "Filter %s has empty joblist. Nothing to do.", b->name);
                return(NULL);
             }
 
             log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) with filter %s...",
-                      csp->http->hostport, csp->http->path, size, b->filtername);
+                      csp->http->hostport, csp->http->path, size, b->name);
 
             /* Apply all jobs from the joblist */
             for (job = b->joblist; NULL != job; job = job->next)