projects / privoxy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Advertise IPv6 support on the show-status page.
[privoxy.git] / templates / show-status
diff --git a/templates/show-status b/templates/show-status
index b107038..2405c4c 100644 (file)
--- a/templates/show-status
+++ b/templates/show-status
@@ -114,6 +114,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+  <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
 </head>
 
 <body>
@@ -166,6 +167,14 @@
           </tr>
 <!-- if-trust-support-end@ -->
         </table>
+<!-- @if-cgi-editor-is-disabled-start -->
+        <p>
+          The CGI editor is currently disabled, thus no edit buttons are shown.<br>
+          Please have a look at the
+           <a href="@user-manual@config.html#ENABLE-EDIT-ACTIONS">enable-edit-actions documentation</a>
+          to learn how to enable it and what the risks are.
+        </p>
+<!--  if-cgi-editor-is-disabled-end@ -->
       </td>
     </tr>
 
@@ -221,9 +230,12 @@
                  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_COOKIE_JAR</code></td>
-              <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td>
-              <td>Allows the use of a <q>cookie jar</q> file to capture cookies.</td>
+              <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>
+               Allows to reuse outgoing connections if the server supports it.
+               Requires the keep-alive-timeout config directive to be set.
+              </td>
             </tr>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
@@ -244,7 +256,15 @@
             <tr>
               <td><code>FEATURE_IMAGE_BLOCKING</code></td>
               <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td>
-              <td>Allows the +image action, to send <q>blocked</q> images instead of HTML.</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>
@@ -253,11 +273,6 @@
                Microsoft Internet Explorer users, overriding the setting of 
                +image in the actions file.</td>
             </tr>
-            <tr>
-              <td><code>FEATURE_KILL_POPUPS</code></td>
-              <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td>
-              <td>Allows the +no-popups action, to block JavaScript popups.</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>
@@ -283,6 +298,12 @@
               <td>@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@</td>
               <td>Allows the use of trust files.</td>
             </tr>
+            <tr>
+              <td><code>FEATURE_ZLIB</code></td>
+              <td>@if-FEATURE_ZLIB-then@ Yes @else-not-FEATURE_ZLIB@ No @endif-FEATURE_ZLIB@</td>
+              <td>Allows to decompress gzip and zlib compressed documents for filtering.
+                Requires external zlib library and hasn't been tested on all platforms.</td>
+            </tr>
             <tr>
               <td><code>STATIC_PCRE</code></td>
               <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
The official Privoxy git repository