debian/patches/39_show-status.patch

   1 From: Roland Rosenfeld <roland@debian.org>
   2 Subject: Add new features to show-status page.
   3 Date: Sun, 06 Dec 2020 14:14:43 +0100
   4 Forwarded: https://www.privoxy.org/gitweb/?p=privoxy.git;a=patch;h=d83b7ce5
   5
   6 --- a/templates/show-status
   7 +++ b/templates/show-status
   8 @@ -299,6 +299,19 @@
   9                </td>
  10              </tr>
  11              <tr>
  12 +              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
  13 +              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
  14 +              <td>Dynamically link to the PCRE library. This is set automatically
  15 +               by <code>./configure</code> if you do not have libpcre installed.
  16 +               Dynamically linking to an external libpcre is recommended as the one that is distributed
  17 +               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
  18 +            </tr>
  19 +            <tr>
  20 +              <td><code>FEATURE_EXTENDED_STATISTICS</code></td>
  21 +              <td>@if-FEATURE_EXTENDED_STATISTICS-then@ Yes @else-not-FEATURE_EXTENDED_STATISTICS@ No @endif-FEATURE_EXTENDED_STATISTICS@</td>
  22 +              <td>Gather statistics for block reasons and filter executions.</td>
  23 +            </tr>
  24 +            <tr>
  25                <td><code>FEATURE_EXTERNAL_FILTERS</code></td>
  26                <td>@if-FEATURE_EXTERNAL_FILTERS-then@ Yes @else-not-FEATURE_EXTERNAL_FILTERS@ No @endif-FEATURE_EXTERNAL_FILTERS@</td>
  27                <td>
  28 @@ -308,14 +321,6 @@
  29                </td>
  30              </tr>
  31              <tr>
  32 -              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
  33 -              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
  34 -              <td>Dynamically link to the PCRE library. This is set automatically
  35 -               by <code>./configure</code> if you do not have libpcre installed.
  36 -               Dynamically linking to an external libpcre is recommended as the one that is distributed
  37 -               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
  38 -            </tr>
  39 -            <tr>
  40                <td><code>FEATURE_FAST_REDIRECTS</code></td>
  41                <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
  42                <td>Allows the +fast-redirects action, to bypass redirect and logging scripts.</td>
  43 @@ -353,6 +358,14 @@
  44                </td>
  45              </tr>
  46              <tr>
  47 +              <td><code>FEATURE_PCRE_HOST_PATTERNS</code></td>
  48 +              <td>@if-FEATURE_PCRE_HOST_PATTERNS-then@ Yes @else-not-FEATURE_PCRE_HOST_PATTERNS@ No @endif-FEATURE_PCRE_HOST_PATTERNS@</td>
  49 +              <td>Allow to use extended host patterns and vanilla host patterns
  50 +               at the same time by prefixing extended host patterns with
  51 +               "PCRE-HOST-PATTERN:".
  52 +              </td>
  53 +            </tr>
  54 +            <tr>
  55                <td><code>FEATURE_NO_GIFS</code></td>
  56                <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td>
  57                <td>Use PNG instead of GIF for the built-in images.</td>
  58 --- a/cgisimple.c
  59 +++ b/cgisimple.c
  60 @@ -2097,6 +2097,22 @@ static jb_err show_defines(struct map *e
  61  #else
  62           0,
  63  #endif
  64 +      },
  65 +      {
  66 +         "FEATURE_EXTENDED_STATISTICS",
  67 +#ifdef FEATURE_EXTENDED_STATISTICS
  68 +         1,
  69 +#else
  70 +         0,
  71 +#endif
  72 +      },
  73 +      {
  74 +         "FEATURE_PCRE_HOST_PATTERNS",
  75 +#ifdef FEATURE_PCRE_HOST_PATTERNS
  76 +         1,
  77 +#else
  78 +         0,
  79 +#endif
  80        }
  81     };
  82