projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add #178: Add a add-server-header{} action
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
ec3c155
..
14b957f
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-59,6
+59,10
@@
typedef pthread_mutex_t privoxy_mutex_t;
#else
# ifdef _WIN32
typedef pthread_mutex_t privoxy_mutex_t;
#else
# ifdef _WIN32
+# include <winsock2.h>
+ /* without winsock2.h I get lots of compiler warnings about
+ * #warning Please include winsock2.h before windows.h
+ */
# include <windows.h>
# endif
typedef CRITICAL_SECTION privoxy_mutex_t;
# include <windows.h>
# endif
typedef CRITICAL_SECTION privoxy_mutex_t;
@@
-649,8
+653,10
@@
struct iob
#define ACTION_MULTI_SERVER_HEADER_TAGGER 5
/** Number of multi-string actions. */
#define ACTION_MULTI_EXTERNAL_FILTER 6
#define ACTION_MULTI_SERVER_HEADER_TAGGER 5
/** Number of multi-string actions. */
#define ACTION_MULTI_EXTERNAL_FILTER 6
+/** Index into current_action_spec::multi[] for tags to suppress. */
+#define ACTION_MULTI_SUPPRESS_TAG 7
/** Number of multi-string actions. */
/** Number of multi-string actions. */
-#define ACTION_MULTI_COUNT
7
+#define ACTION_MULTI_COUNT
8
/**
/**
@@
-1303,13
+1309,14
@@
enum filter_type
#ifdef FEATURE_EXTERNAL_FILTERS
FT_EXTERNAL_CONTENT_FILTER = 5,
#endif
#ifdef FEATURE_EXTERNAL_FILTERS
FT_EXTERNAL_CONTENT_FILTER = 5,
#endif
+ FT_SUPPRESS_TAG = 6,
FT_INVALID_FILTER = 42,
};
#ifdef FEATURE_EXTERNAL_FILTERS
FT_INVALID_FILTER = 42,
};
#ifdef FEATURE_EXTERNAL_FILTERS
-#define MAX_FILTER_TYPES
6
+#define MAX_FILTER_TYPES
7
#else
#else
-#define MAX_FILTER_TYPES
5
+#define MAX_FILTER_TYPES
6
#endif
/**
#endif
/**
@@
-1645,8
+1652,13
@@
struct configuration_spec
* The prefix for CGI pages. Written out in generated HTML.
* INCLUDES the trailing slash.
*/
* The prefix for CGI pages. Written out in generated HTML.
* INCLUDES the trailing slash.
*/
+#ifdef FEATURE_HTTPS_INSPECTION
+#define CGI_PREFIX "//" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
+#define CGI_PREFIX_HTTPS "https:" CGI_PREFIX
+#else
#define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
#define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
-#define CGI_PREFIX_HTTPS "https://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
+#endif
+#define CGI_PREFIX_HTTP "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
#endif /* ndef PROJECT_H_INCLUDED */
#endif /* ndef PROJECT_H_INCLUDED */