X-Git-Url: http://www.privoxy.org/gitweb/new.html?a=blobdiff_plain;f=filters.h;h=6de0af1162cb4ff4b58277d189a98940672bcbfb;hb=f29c70474289ca767584c45d2d57cbfd9ca9c7b3;hp=2faa2272171a6729c38c032652eb7f5216b3ec20;hpb=75ac7b1cb0f8608b9ea6124ea2bd2ba7eb16a7ec;p=privoxy.git
diff --git a/filters.h b/filters.h
index 2faa2272..6de0af11 100644
--- a/filters.h
+++ b/filters.h
@@ -1,6 +1,6 @@
#ifndef FILTERS_H_INCLUDED
#define FILTERS_H_INCLUDED
-#define FILTERS_H_VERSION "$Id: filters.h,v 1.38 2010/05/01 18:20:50 fabiankeil Exp $"
+#define FILTERS_H_VERSION "$Id: filters.h,v 1.42 2011/07/30 15:17:35 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.h,v $
@@ -16,10 +16,10 @@
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
@@ -89,8 +89,8 @@ extern int connect_port_is_forbidden(const struct client_state *csp);
*/
extern void get_url_actions(struct client_state *csp,
struct http_request *http);
-extern void apply_url_actions(struct current_action_spec *action,
- struct http_request *http,
+extern void apply_url_actions(struct current_action_spec *action,
+ struct http_request *http,
struct url_actions *b);
/*
* Determining parent proxies
@@ -101,17 +101,14 @@ extern const struct forward_spec *forward_url(struct client_state *csp,
/*
* Content modification
*/
-
-typedef char *(*filter_function_ptr)();
extern char *execute_content_filters(struct client_state *csp);
-
-extern filter_function_ptr get_filter_function(struct client_state *csp);
extern char *execute_single_pcrs_command(char *subject, const char *pcrs_command, int *hits);
extern char *rewrite_url(char *old_url, const char *pcrs_command);
extern char *get_last_url(char *subject, const char *redirect_mode);
extern pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const struct re_filterfile_spec *b);
+extern int content_requires_filtering(struct client_state *csp);
extern int content_filters_enabled(const struct current_action_spec *action);
extern int filters_available(const struct client_state *csp);
@@ -120,15 +117,7 @@ extern int filters_available(const struct client_state *csp);
*/
extern struct http_response *direct_response(struct client_state *csp);
-
/*
- * Solaris fix:
- */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1
-#endif
-
-/*
* Revision control strings from this header and associated .c file
*/
extern const char filters_rcs[];