From: jongfoster Date: Wed, 1 Aug 2001 00:22:39 +0000 (+0000) Subject: Changes to "Conditional Defines" section, so all the HTML relating X-Git-Tag: v_2_9_9~165 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=8c683756b0f6b38d90681f65c2dcdfbd6e3cd497 Changes to "Conditional Defines" section, so all the HTML relating to this section is now in this template, NOT in showargs.c. --- diff --git a/templates/show-status b/templates/show-status index e3f8e258..c485c2de 100644 --- a/templates/show-status +++ b/templates/show-status @@ -89,29 +89,14 @@ # Junkbuster was compiled with pcrs support # trust-support: # Junkbuster was compiled with trust support -# split-args: -# Junkbuster was compiled with #define SPLIT_PROXY_ARGS -# In this case, the following symbols are available: -# actions-filename: -# The path to the actions file. -# re-filter-filename: -# The path to the re_filter file. Only available if -# pcrs-support is set -# trust-filename: -# The path to the trust file.Only available if -# trust-support is set -# no-split-args: -# Junkbuster was not compiled with #define SPLIT_PROXY_ARGS -# In this case, the following symbols are available: -# alist: -# The contents of the actionsfile -# rlist: -# The contents of the re_filterfile. Only available if -# pcrs-support is set -# tlist: -# The contents of the trustfile. Only available if -# trust-support is set -# +# actions-filename: +# The path to the actions file. +# re-filter-filename: +# The path to the re_filter file. Only available if +# pcrs-support is set +# trust-filename: +# The path to the trust file.Only available if +# trust-support is set @@ -168,7 +153,7 @@
@requests-blocked@ out of @requests-received@ requests have been blocked, - which equals a block rate of @percent-blocked@. + which equals a block rate of @percent-blocked@%. There haven't been any requests so far. @@ -177,7 +162,6 @@ -

The following files are in use:

@@ -193,34 +177,104 @@ - - - - - -

Actions List:

- 
@alist@
- - - - - - -

Regex Filter List:

- 
@rlist@
- - - - -

Trust List:

- 
@tlist@
+

Conditional #defines:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define Enabled? Effects when enabled
FEATURE_PTHREAD@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@Use POSIX threads rather than native threads
FEATURE_ACL@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@Allows the use of an ACL to control access to the proxy by IP address.
FEATURE_COOKIE_JAR@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@Allows the use of a "cookie jar" file to capture cookies.
FEATURE_DENY_GZIP@if-FEATURE_DENY_GZIP-then@ Yes @else-not-FEATURE_DENY_GZIP@ No @endif-FEATURE_DENY_GZIP@Prevents requests from being compressed. This means that all + sites can be filtered through +filter and +no-popups, but it + wastes bandwidth.
FEATURE_FAST_REDIRECTS@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@Allows the +fast-redirects action, to bypass redirect and logging scripts.
FEATURE_FORCE_LOAD@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@Allows bypassing all filtering for a single page using the prefix "@FORCE_PREFIX@".
FEATURE_IMAGE_BLOCKING@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@Allows the +image ation, to send "blocked" images instead of HTML.
FEATURE_IMAGE_DETECT_MSIE@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@Enables automatic detection of image and HTML requests from + Microsoft Internet Explorer users, overriding the setting of + +image in the actions file.
FEATURE_KILL_POPUPS@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@Allows the +no-popups action, to block JavaScript popups.
FEATURE_STATISTICS@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@Enables the statistics function.
FEATURE_TOGGLE@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@Allow JunkBuster to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.
FEATURE_TRUST@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@Allows the use of trust files.
REGEX_GNU@if-REGEX_GNU-then@ Yes @else-not-REGEX_GNU@ No @endif-REGEX_GNU@Changes the type of pattern matching done on URL paths. PCRE is by far the best. + The old GNU style will slow down JunkBuster and increase the executable's size. If both of + these are disabled, simple prefix matching is done, but this is very inflexible.
REGEX_PCRE@if-REGEX_PCRE-then@ Yes @else-not-REGEX_PCRE@ No @endif-REGEX_PCRE@
STATIC_PCRE@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@Use the supplied statically-linked PCRE library. This is set automatically + by ./configure if you do not have the libpcre installed.
STATIC_PCRS@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@Use the supplied statically-linked PCRS library. This is set automatically + by ./configure if you do not have the libpcrs installed.
- - @@ -229,13 +283,6 @@ - - -

Conditional #defines:

- - - -

More Junkbuster:

@@ -260,4 +307,4 @@ - \ No newline at end of file +