Change version to 3.0.9 UNRELEASED.

[privoxy.git] / filters.c

diff --git a/filters.c b/filters.c
index c3a7fdf..388daf4 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.92 2007/09/28 16:38:55 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.97 2007/11/30 15:37:03 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -40,6 +40,24 @@ const char filters_rcs[] = "$Id: filters.c,v 1.92 2007/09/28 16:38:55 fabiankeil
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.97  2007/11/30 15:37:03  fabiankeil
+ *    Use freez instead of free.
+ *
+ *    Revision 1.96  2007/10/19 16:53:28  fabiankeil
+ *    Add helper function to check if any content filters are enabled.
+ *
+ *    Revision 1.95  2007/10/17 19:31:20  fabiankeil
+ *    Omitting the zero chunk that ends the chunk transfer encoding seems
+ *    to be the new black. Log the problem and continue filtering anyway.
+ *
+ *    Revision 1.94  2007/09/29 13:20:20  fabiankeil
+ *    Remove two redundant and one useless log messages.
+ *
+ *    Revision 1.93  2007/09/29 10:21:16  fabiankeil
+ *    - Move get_filter_function() from jcc.c to filters.c
+ *      so the filter functions can be static.
+ *    - Don't bother filtering body-less responses.
+ *
  *    Revision 1.92  2007/09/28 16:38:55  fabiankeil
  *    - Execute content filters through execute_content_filter().
  *    - Add prepare_for_filtering() so filter functions don't have to
@@ -734,7 +752,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
       *p++ = '\0';
       if (ijb_isdigit(*p) == 0)
       {
-         free(acl_spec);
+         freez(acl_spec);
          return(-1);
       }
       masklength = atoi(p);
@@ -742,7 +760,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
 
    if ((masklength < 0) || (masklength > 32))
    {
-      free(acl_spec);
+      freez(acl_spec);
       return(-1);
    }
 
@@ -755,7 +773,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
 
       if (port <= 0 || port > 65535 || *endptr != '\0')
       {
-         free(acl_spec);
+         freez(acl_spec);
          return(-1);
       }
    }
@@ -763,7 +781,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
    aca->port = (unsigned long)port;
 
    aca->addr = ntohl(resolve_hostname_to_ip(acl_spec));
-   free(acl_spec);
+   freez(acl_spec);
 
    if (aca->addr == INADDR_NONE)
    {
@@ -1710,7 +1728,7 @@ int is_untrusted_url(const struct client_state *csp)
                   log_error(LOG_LEVEL_ERROR, "Failed to append \'%s\' to trustfile \'%s\': %E",
                      new_entry, csp->config->trustfile);
                }
-               free(new_entry);
+               freez(new_entry);
             }
             else
             {
@@ -1790,7 +1808,8 @@ static char *pcrs_filter_response(struct client_state *csp)
 
    if (0 == found_filters)
    {
-      log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering.");
+      log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
+         "content filtering enabled, but no content filters available.");
       return(NULL);
    }
 
@@ -1861,7 +1880,7 @@ static char *pcrs_filter_response(struct client_state *csp)
                   current_hits += job_hits;
                   if (old != csp->iob->cur)
                   {
-                     free(old);
+                     freez(old);
                   }
                   old = new;
                }
@@ -1907,7 +1926,7 @@ static char *pcrs_filter_response(struct client_state *csp)
     */
    if (!hits)
    {
-      free(new);
+      freez(new);
       return(NULL);
    }
 
@@ -1956,7 +1975,7 @@ static char *gif_deanimate_response(struct client_state *csp)
    if (gif_deanimate(in, out, strncmp("last", csp->action->string[ACTION_STRING_DEANIMATE], 4)))
    {
       log_error(LOG_LEVEL_DEANIMATE, "failed! (gif parsing)");
-      free(in);
+      freez(in);
       buf_free(out);
       return(NULL);
    }
@@ -1973,8 +1992,8 @@ static char *gif_deanimate_response(struct client_state *csp)
       csp->content_length = out->offset;
       csp->flags |= CSP_FLAG_MODIFIED;
       p = out->buffer;
-      free(in);
-      free(out);
+      freez(in);
+      freez(out);
       return(p);
    }
 
@@ -2025,7 +2044,7 @@ static char *jpeg_inspect_response(struct client_state *csp)
    if (jpeg_inspect(in, out))
    {
       log_error(LOG_LEVEL_DEANIMATE, "failed! (jpeg parsing)");
-      free(in);
+      freez(in);
       buf_free(out);
       return(NULL);
 
@@ -2035,8 +2054,8 @@ static char *jpeg_inspect_response(struct client_state *csp)
       csp->content_length = out->offset;
       csp->flags |= CSP_FLAG_MODIFIED;
       p = out->buffer;
-      free(in);
-      free(out);
+      freez(in);
+      freez(out);
       return(p);
    }
 
@@ -2177,16 +2196,11 @@ static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size)
 
       if (sscanf(from_p, "%x", &chunksize) != 1)
       {
-         log_error(LOG_LEVEL_ERROR, "Parse error while stripping \"chunked\" transfer coding");
-         return JB_ERR_PARSE;
+         log_error(LOG_LEVEL_INFO, "Invalid \"chunked\" transfer encoding detected and ignored.");
+         break;
       }
    }
    
-   if (0 == newsize)
-   {
-      log_error(LOG_LEVEL_RE_FILTER, "Need to de-chunk first");
-   }
-   
    /* XXX: Should get its own loglevel. */
    log_error(LOG_LEVEL_RE_FILTER, "De-chunking successful. Shrunk from %d to %d", *size, newsize);
 
@@ -2232,7 +2246,6 @@ static jb_err prepare_for_filtering(struct client_state *csp)
       }
       else
       {
-         log_error(LOG_LEVEL_ERROR, "Failed to de-chunk content.");
          return JB_ERR_PARSE;
       }
    }
@@ -2265,7 +2278,6 @@ static jb_err prepare_for_filtering(struct client_state *csp)
           */
          csp->content_type &= ~CT_GZIP;
          csp->content_type &= ~CT_DEFLATE;
-         log_error(LOG_LEVEL_ERROR, "Failed to decompress content.");
       }
    }
 #endif
@@ -2303,7 +2315,6 @@ char *execute_content_filter(struct client_state *csp, filter_function_ptr conte
    {
       /*
        * failed to de-chunk or decompress.
-       * XXX: if possible, we should continue anyway.
        */
       return NULL;
    }
@@ -2646,6 +2657,26 @@ struct http_response *direct_response(struct client_state *csp)
 }
 
 
+/*********************************************************************
+ *
+ * Function    :  content_filters_enabled
+ *
+ * Description :  Checks whether there are any content filters
+ *                enabled for the current request.
+ *
+ * Parameters  :  
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns     :  TRUE for yes, FALSE otherwise
+ *
+ *********************************************************************/
+inline int content_filters_enabled(const struct client_state *csp)
+{
+   return (((csp->rlist != NULL) &&
+      (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||
+      (csp->action->flags & (ACTION_DEANIMATE|ACTION_JPEG_INSPECT|ACTION_NO_POPUPS)));
+}
+
 /*
   Local Variables:
   tab-width: 3