projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
javascript needs to be blocked with +handle-as-empty-document to
[privoxy.git]
/
parsers.c
diff --git
a/parsers.c
b/parsers.c
index
c2020c7
..
c24b518
100644
(file)
--- a/
parsers.c
+++ b/
parsers.c
@@
-1,4
+1,4
@@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.2
09 2009/09/06 14:11:0
6 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.2
10 2009/12/25 11:39:2
6 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@
-1209,7
+1209,6
@@
static jb_err header_tagger(struct client_state *csp, char *header)
struct re_filterfile_spec *b;
struct list_entry *tag_name;
struct re_filterfile_spec *b;
struct list_entry *tag_name;
- int found_filters = 0;
const size_t header_length = strlen(header);
if (csp->flags & CSP_FLAG_CLIENT_HEADER_PARSING_DONE)
const size_t header_length = strlen(header);
if (csp->flags & CSP_FLAG_CLIENT_HEADER_PARSING_DONE)
@@
-1223,21
+1222,7
@@
static jb_err header_tagger(struct client_state *csp, char *header)
multi_action_index = ACTION_MULTI_CLIENT_HEADER_TAGGER;
}
multi_action_index = ACTION_MULTI_CLIENT_HEADER_TAGGER;
}
- /* Check if there are any filters */
- for (i = 0; i < MAX_AF_FILES; i++)
- {
- fl = csp->rlist[i];
- if (NULL != fl)
- {
- if (NULL != fl->f)
- {
- found_filters = 1;
- break;
- }
- }
- }
-
- if (0 == found_filters)
+ if (filters_available(csp) == FALSE)
{
log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
"tagging enabled, but no taggers available.");
{
log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
"tagging enabled, but no taggers available.");
@@
-1420,7
+1405,7
@@
static jb_err filter_header(struct client_state *csp, char **header)
struct re_filterfile_spec *b;
struct list_entry *filtername;
struct re_filterfile_spec *b;
struct list_entry *filtername;
- int i
, found_filters = 0
;
+ int i;
int wanted_filter_type;
int multi_action_index;
int wanted_filter_type;
int multi_action_index;
@@
-1440,23
+1425,7
@@
static jb_err filter_header(struct client_state *csp, char **header)
multi_action_index = ACTION_MULTI_CLIENT_HEADER_FILTER;
}
multi_action_index = ACTION_MULTI_CLIENT_HEADER_FILTER;
}
- /*
- * Need to check the set of re_filterfiles...
- */
- for (i = 0; i < MAX_AF_FILES; i++)
- {
- fl = csp->rlist[i];
- if (NULL != fl)
- {
- if (NULL != fl->f)
- {
- found_filters = 1;
- break;
- }
- }
- }
-
- if (0 == found_filters)
+ if (filters_available(csp) == FALSE)
{
log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
"header filtering enabled, but no matching filters available.");
{
log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: "
"header filtering enabled, but no matching filters available.");