X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-status;h=404dd4f29a5257802cbdc4984ebc4f1281f94b27;hp=a07c1736fce2abcbcc291e8f40fdb6ccd6bf5561;hb=7eafc54950fbdd6afd5babf053c8a1625ccc7912;hpb=42707de0ad339fe8fba0862ca7a3267124ce3440

diff --git a/templates/show-status b/templates/show-status
index a07c1736..404dd4f2 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -200,6 +200,12 @@
   <!-- @if-have-stats-start -->
           @requests-blocked@ out of @requests-received@ requests have been blocked,
           which equals a block rate of @percent-blocked@%.
+        </p>
+        <p>
+          <strong>Note that the statistics currently don't work properly for
+          reused connections where only the last request gets counted.
+          You may want to look into Privoxy-Log-Parser's --statistics option,
+          which doesn't have this limitation.</strong>
 <!-- if-have-stats-end@ -->
 <!-- @if-have-no-stats-start -->
           There haven't been any requests so far.
@@ -216,6 +222,12 @@
             <tr> 
               <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th>
             </tr>
+
+            <tr>
+              <td><code>FEATURE_ACCEPT_FILTER</code></td>
+              <td>@if-FEATURE_ACCEPT_FILTER-then@ Yes @else-not-FEATURE_ACCEPT_FILTER@ No @endif-FEATURE_ACCEPT_FILTER@</td>
+              <td>Support for FreeBSD's accf_http(9) which is also available on some other BSDs.</td>
+            </tr>
             <tr>
               <td><code>FEATURE_ACL</code></td>
               <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td>
@@ -229,10 +241,28 @@
                  @endif-FEATURE_CGI_EDIT_ACTIONS@web-based actions file
                  editor@if-FEATURE_CGI_EDIT_ACTIONS-then@</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_COMPRESSION</code></td>
+              <td>@if-FEATURE_COMPRESSION-then@ Yes @else-not-FEATURE_COMPRESSION@ No @endif-FEATURE_COMPRESSION@</td>
+              <td>
+               Allows to compress buffered content before sending it to the client, assuming the client supports it.
+              </td>
+            </tr>
             <tr>
               <td><code>FEATURE_CONNECTION_KEEP_ALIVE</code></td>
               <td>@if-FEATURE_CONNECTION_KEEP_ALIVE-then@ Yes @else-not-FEATURE_CONNECTION_KEEP_ALIVE@ No @endif-FEATURE_CONNECTION_KEEP_ALIVE@</td>
-              <td>Keep outgoing connections alive if possible. <strong>Incomplete and experimental.</strong></td>
+              <td>
+               Allows to send multiple request through the same connections if the server supports it.
+               Requires the keep-alive-timeout config directive to be set.
+              </td>
+            </tr>
+            <tr>
+              <td><code>FEATURE_CONNECTION_SHARING</code></td>
+              <td>@if-FEATURE_CONNECTION_SHARING-then@ Yes @else-not-FEATURE_CONNECTION_SHARING@ No @endif-FEATURE_CONNECTION_SHARING@</td>
+              <td>
+               Allows to share outgoing connections between incoming connections.
+               Requires the connection-sharing config directive to be set.
+              </td>
             </tr>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
@@ -255,6 +285,14 @@
               <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td>
               <td>Allows the +handle-as-image action, to send <q>blocked</q> images instead of HTML.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_IPV6_SUPPORT</code></td>
+              <td>@if-FEATURE_IPV6_SUPPORT-then@ Yes @else-not-FEATURE_IPV6_SUPPORT@ No @endif-FEATURE_IPV6_SUPPORT@</td>
+              <td>
+               Allows IPv6 addresses in incoming requests, when resolving domains to
+               IP addresses and in the configuration files.
+              </td>
+            </tr>
             <tr>
               <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
               <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td>
@@ -296,8 +334,10 @@
             <tr>
               <td><code>STATIC_PCRE</code></td>
               <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
-              <td>Use the supplied statically-linked PCRE library.  This is set automatically
-               by <code>./configure</code> if you do not have the libpcre installed.</td>
+              <td>Use the supplied statically-linked PCRE library. This is set automatically
+               by <code>./configure</code> if you do not have the libpcre installed.
+               Dynamically linking to an external libpcre is recommended as the internal
+               one is outdated and lacks various features and bug-fixes you may be interested in.</td>
             </tr>
             <tr>
               <td><code>STATIC_PCRS</code></td>