X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.c;h=bd5d33d2afaaf37c5727d120c7a91495e7e45331;hp=4b4e9b7fa98f0874d2e825ea060b8ed44bcb680e;hb=fe2a87f9ef4a6911b0b5ebc46a8887d84e0d5916;hpb=f277102c92b228eb19756ac1357ae6429d9f1f35

diff --git a/parsers.c b/parsers.c
index 4b4e9b7f..bd5d33d2 100644
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.277 2013/04/23 09:43:25 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.278 2013/08/06 12:58:28 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -1296,16 +1296,10 @@ static jb_err header_tagger(struct client_state *csp, char *header)
       multi_action_index = ACTION_MULTI_CLIENT_HEADER_TAGGER;
    }
 
-   if (list_is_empty(csp->action->multi[multi_action_index]))
+   if (list_is_empty(csp->action->multi[multi_action_index])
+      || filters_available(csp) == FALSE)
    {
-      /* No appropriate tagger enabled, nothing left to do. */
-      return JB_ERR_OK;
-   }
-
-   if (filters_available(csp) == FALSE)
-   {
-      log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
-         "tagging enabled, but no taggers available.");
+      /* Return early if no taggers apply or if none are available. */
       return JB_ERR_OK;
    }
 
@@ -1505,16 +1499,10 @@ static jb_err filter_header(struct client_state *csp, char **header)
       multi_action_index = ACTION_MULTI_CLIENT_HEADER_FILTER;
    }
 
-   if (list_is_empty(csp->action->multi[multi_action_index]))
-   {
-      /* No appropriate header filter enabled, nothing left to do. */
-      return JB_ERR_OK;
-   }
-
-   if (filters_available(csp) == FALSE)
+   if (list_is_empty(csp->action->multi[multi_action_index])
+      || filters_available(csp) == FALSE)
    {
-      log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
-         "header filtering enabled, but no matching filters available.");
+      /* Return early if no filters apply or if none are available. */
       return JB_ERR_OK;
    }