X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=39fd39ec6d885009bd7bb040b053690b410fb36b;hp=14b957f8c2c2469a7cad73bc82b4cd46b98e07cc;hb=fd81b8b7599f845ea731153fbacc52528bd978d0;hpb=867cd1d8d3a03442c86036fed101c6fcf6c7fd04 diff --git a/project.h b/project.h index 14b957f8..39fd39ec 100644 --- a/project.h +++ b/project.h @@ -54,20 +54,6 @@ #define HASH_OF_HOST_BUF_SIZE 16 #endif /* FEATURE_HTTPS_INSPECTION */ -#ifdef FEATURE_PTHREAD -# include - typedef pthread_mutex_t privoxy_mutex_t; -#else -# ifdef _WIN32 -# include - /* without winsock2.h I get lots of compiler warnings about - * #warning Please include winsock2.h before windows.h - */ -# include -# endif - typedef CRITICAL_SECTION privoxy_mutex_t; -#endif - #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS #include "mbedtls/net_sockets.h" #include "mbedtls/entropy.h" @@ -655,8 +641,10 @@ struct iob #define ACTION_MULTI_EXTERNAL_FILTER 6 /** Index into current_action_spec::multi[] for tags to suppress. */ #define ACTION_MULTI_SUPPRESS_TAG 7 +/** Index into current_action_spec::multi[] for client body filters to apply. */ +#define ACTION_MULTI_CLIENT_BODY_FILTER 8 /** Number of multi-string actions. */ -#define ACTION_MULTI_COUNT 8 +#define ACTION_MULTI_COUNT 9 /** @@ -1306,17 +1294,18 @@ enum filter_type FT_SERVER_HEADER_FILTER = 2, FT_CLIENT_HEADER_TAGGER = 3, FT_SERVER_HEADER_TAGGER = 4, + FT_SUPPRESS_TAG = 5, + FT_CLIENT_BODY_FILTER = 6, #ifdef FEATURE_EXTERNAL_FILTERS - FT_EXTERNAL_CONTENT_FILTER = 5, + FT_EXTERNAL_CONTENT_FILTER = 7, #endif - FT_SUPPRESS_TAG = 6, FT_INVALID_FILTER = 42, }; #ifdef FEATURE_EXTERNAL_FILTERS -#define MAX_FILTER_TYPES 7 +#define MAX_FILTER_TYPES 8 #else -#define MAX_FILTER_TYPES 6 +#define MAX_FILTER_TYPES 7 #endif /**