projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump copyright
[privoxy.git]
/
cgiedit.c
diff --git
a/cgiedit.c
b/cgiedit.c
index
e824129
..
a1d4e79
100644
(file)
--- a/
cgiedit.c
+++ b/
cgiedit.c
@@
-1,4
+1,4
@@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.
75 2012/03/09 17:55:49
fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.
80 2014/06/02 06:19:04
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
@@
-13,7
+13,7
@@
const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.75 2012/03/09 17:55:49 fabiankeil
*
* Stick to the short names in this file for consistency.
*
*
* Stick to the short names in this file for consistency.
*
- * Copyright : Written by and Copyright (C) 2001-20
08 the SourceForg
e
+ * Copyright : Written by and Copyright (C) 2001-20
14 th
e
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-121,19
+121,6
@@
struct file_line
} setting;
} setting;
- /* Add more data types here... e.g.
-
-
- struct url_spec url[1];
-
- struct
- {
- struct action_spec action[1];
- const char * name;
- } alias;
-
- */
-
} data;
};
} data;
};
@@
-256,6
+243,14
@@
static const struct filter_type_info filter_type_info[] =
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
+#ifdef FEATURE_EXTERNAL_FILTERS
+ {
+ ACTION_MULTI_EXTERNAL_FILTER,
+ "external-content-filter-params", "external-filter",
+ "external-content-filter-all", "external_content_filter_all",
+ "E", "EXTERNAL-CONTENT-FILTER"
+ },
+#endif
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
@@
-1840,7
+1835,7
@@
static jb_err get_url_spec_param(struct client_state *csp,
const char *orig_param;
char *param;
char *s;
const char *orig_param;
char *param;
char *s;
- struct
url
_spec compiled[1];
+ struct
pattern
_spec compiled[1];
jb_err err;
assert(csp);
jb_err err;
assert(csp);
@@
-1888,14
+1883,14
@@
static jb_err get_url_spec_param(struct client_state *csp,
free(param);
return JB_ERR_MEMORY;
}
free(param);
return JB_ERR_MEMORY;
}
- err = create_
url
_spec(compiled, s);
+ err = create_
pattern
_spec(compiled, s);
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
- free_
url
_spec(compiled);
+ free_
pattern
_spec(compiled);
if (param[strlen(param) - 1] == '\\')
{
if (param[strlen(param) - 1] == '\\')
{
@@
-1924,14
+1919,14
@@
static jb_err get_url_spec_param(struct client_state *csp,
free(param);
return JB_ERR_MEMORY;
}
free(param);
return JB_ERR_MEMORY;
}
- err = create_
url
_spec(compiled, s);
+ err = create_
pattern
_spec(compiled, s);
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
- free_
url
_spec(compiled);
+ free_
pattern
_spec(compiled);
}
*pvalue = param;
}
*pvalue = param;
@@
-2833,6
+2828,10
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
}
}
}
}
+#ifndef FEATURE_EXTERNAL_FILTERS
+ if (!err) err = map_block_killer(exports, "external-content-filters");
+#endif
+
if (err)
{
edit_free_file(file);
if (err)
{
edit_free_file(file);