From d83b7ce5d60b40bf7ecd9b50a340831b5a2dda7b Mon Sep 17 00:00:00 2001
From: Roland Rosenfeld <roland@debian.org>
Date: Sun, 6 Dec 2020 15:22:45 +0100
Subject: [PATCH] Add new FEATURES o show-status page and resort list.

---
 cgisimple.c           | 16 ++++++++++++++++
 templates/show-status | 29 +++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/cgisimple.c b/cgisimple.c
index cdb959aa..e1a893be 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -2096,6 +2096,22 @@ static jb_err show_defines(struct map *exports)
          1,
 #else
          0,
+#endif
+      },
+      {
+         "FEATURE_EXTENDED_STATISTICS",
+#ifdef FEATURE_EXTENDED_STATISTICS
+         1,
+#else
+         0,
+#endif
+      },
+      {
+         "FEATURE_PCRE_HOST_PATTERNS",
+#ifdef FEATURE_PCRE_HOST_PATTERNS
+         1,
+#else
+         0,
 #endif
       }
    };
diff --git a/templates/show-status b/templates/show-status
index 73a7d3ab..838cb516 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -298,6 +298,19 @@
                Requires the connection-sharing config directive to be set.
               </td>
             </tr>
+            <tr>
+              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
+              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
+              <td>Dynamically link to the PCRE library. This is set automatically
+               by <code>./configure</code> if you do not have libpcre installed.
+               Dynamically linking to an external libpcre is recommended as the one that is distributed
+               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
+            </tr>
+            <tr>
+              <td><code>FEATURE_EXTENDED_STATISTICS</code></td>
+              <td>@if-FEATURE_EXTENDED_STATISTICS-then@ Yes @else-not-FEATURE_EXTENDED_STATISTICS@ No @endif-FEATURE_EXTENDED_STATISTICS@</td>
+              <td>Gather statistics for block reasons and filter executions.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_EXTERNAL_FILTERS</code></td>
               <td>@if-FEATURE_EXTERNAL_FILTERS-then@ Yes @else-not-FEATURE_EXTERNAL_FILTERS@ No @endif-FEATURE_EXTERNAL_FILTERS@</td>
@@ -307,14 +320,6 @@
                runs on supports.
               </td>
             </tr>
-            <tr>
-              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
-              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
-              <td>Dynamically link to the PCRE library. This is set automatically
-               by <code>./configure</code> if you do not have libpcre installed.
-               Dynamically linking to an external libpcre is recommended as the one that is distributed
-               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
-            </tr>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
               <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
@@ -352,6 +357,14 @@
                IP addresses and in the configuration files.
               </td>
             </tr>
+            <tr>
+              <td><code>FEATURE_PCRE_HOST_PATTERNS</code></td>
+              <td>@if-FEATURE_PCRE_HOST_PATTERNS-then@ Yes @else-not-FEATURE_PCRE_HOST_PATTERNS@ No @endif-FEATURE_PCRE_HOST_PATTERNS@</td>
+              <td>Allow to use extended host patterns and vanilla host patterns
+               at the same time by prefixing extended host patterns with
+               "PCRE-HOST-PATTERN:".
+              </td>
+            </tr>
             <tr>
               <td><code>FEATURE_NO_GIFS</code></td>
               <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td>
-- 
2.39.2