From 95923775ba5f094b8a09499e7c1e45f4e58074f3 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 7 Dec 2021 15:36:39 +0100
Subject: [PATCH] Rebuild docs with updated ChangeLog

---
 doc/webserver/user-manual/appendix.html      |  16 +-
 doc/webserver/user-manual/configuration.html |   2 +-
 doc/webserver/user-manual/quickstart.html    |   2 +-
 doc/webserver/user-manual/startup.html       |   4 +-
 doc/webserver/user-manual/whatsnew.html      | 165 +++++++++++--------
 5 files changed, 110 insertions(+), 79 deletions(-)

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 7193b92b..a6f6b68a 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -202,7 +202,7 @@
       these. If not, you will get a friendly error message. Internet access is not necessary either.</p>
       <ul>
         <li>
-          <p>Privoxy main page:</p><a name="AEN6459" id="AEN6459"></a>
+          <p>Privoxy main page:</p><a name="AEN6475" id="AEN6475"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a></p>
           </blockquote>
@@ -211,7 +211,7 @@
           "APPLICATION">Privoxy</span>)</p>
         </li>
         <li>
-          <p>View and toggle client tags:</p><a name="AEN6467" id="AEN6467"></a>
+          <p>View and toggle client tags:</p><a name="AEN6483" id="AEN6483"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/client-tags" target=
             "_top">http://config.privoxy.org/client-tags</a></p>
@@ -219,21 +219,21 @@
         </li>
         <li>
           <p>Show information about the current configuration, including viewing and editing of actions
-          files:</p><a name="AEN6472" id="AEN6472"></a>
+          files:</p><a name="AEN6488" id="AEN6488"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
             "_top">http://config.privoxy.org/show-status</a></p>
           </blockquote>
         </li>
         <li>
-          <p>Show the browser's request headers:</p><a name="AEN6477" id="AEN6477"></a>
+          <p>Show the browser's request headers:</p><a name="AEN6493" id="AEN6493"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
             "_top">http://config.privoxy.org/show-request</a></p>
           </blockquote>
         </li>
         <li>
-          <p>Show which actions apply to a URL and why:</p><a name="AEN6482" id="AEN6482"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN6498" id="AEN6498"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
             "_top">http://config.privoxy.org/show-url-info</a></p>
@@ -242,15 +242,15 @@
         <li>
           <p>Toggle Privoxy on or off. This feature can be turned off/on in the main <tt class="FILENAME">config</tt>
           file. When toggled <span class="QUOTE">"off"</span>, <span class="QUOTE">"Privoxy"</span> continues to run,
-          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6490" id="AEN6490"></a>
+          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6506" id="AEN6506"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target="_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>
-          <p>Short cuts. Turn off, then on:</p><a name="AEN6494" id="AEN6494"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN6510" id="AEN6510"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>
-          </blockquote><a name="AEN6497" id="AEN6497"></a>
+          </blockquote><a name="AEN6513" id="AEN6513"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
             "_top">http://config.privoxy.org/toggle?set=enable</a></p>
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 8429cbb7..b39227bf 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -40,7 +40,7 @@
         <tr>
           <td>
             <pre class="SCREEN">   </pre>
-            <h2 class="BRIDGEHEAD"><a name="AEN933"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <h2 class="BRIDGEHEAD"><a name="AEN949"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
             <pre><br></pre>
             <table border="0">
               <tbody>
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 66a5b871..ab129002 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -219,7 +219,7 @@
           <p>Find <tt class="FILENAME">user.action</tt> in the top section, and click on <span class=
           "QUOTE">"<span class="GUIBUTTON">Edit</span>"</span>:</p>
           <div class="FIGURE">
-            <a name="AEN700" id="AEN700"></a>
+            <a name="AEN716" id="AEN716"></a>
             <p><b>Figure 1. Actions Files in Use</b></p>
             <div class="MEDIAOBJECT">
               <p><img src="files-in-use.jpg"></p>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index f4771af6..c7e8c380 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -35,7 +35,7 @@
     <p>Please note that <span class="APPLICATION">Privoxy</span> can only proxy HTTP and HTTPS traffic. It will not
     work with FTP or other protocols.</p>
     <div class="FIGURE">
-      <a name="AEN754" id="AEN754"></a>
+      <a name="AEN770" id="AEN770"></a>
       <p><b>Figure 2. Proxy Configuration Showing Mozilla Firefox HTTP and HTTPS (SSL) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy_setup.jpg"></p>
@@ -66,7 +66,7 @@
     protocols"</span> is <span class="emphasis"><i class="EMPHASIS">UNCHECKED</i></span>. You want only HTTP and HTTPS
     (SSL)!</p>
     <div class="FIGURE">
-      <a name="AEN796" id="AEN796"></a>
+      <a name="AEN812" id="AEN812"></a>
       <p><b>Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy2.jpg"></p>
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 6b5e928e..57c60905 100644
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -32,6 +32,29 @@
     with a couple of general improvements an new features.</p>
     <p>Changes in <span class="APPLICATION">Privoxy 3.0.33</span> stable:</p>
     <ul>
+      <li>
+        <p>Security/Reliability:</p>
+        <ul>
+          <li>
+            <p>cgi_error_no_template(): Encode the template name to prevent XSS (cross-side scripting) when Privoxy is
+            configured to servce the user-manual itself. Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543.
+            Reported by: Artem Ivanov</p>
+          </li>
+          <li>
+            <p>get_url_spec_param(): Free memory of compiled pattern spec before bailing. Reported by Joshua Rogers
+            (Opera) who also provided the fix. Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540.</p>
+          </li>
+          <li>
+            <p>process_encrypted_request_headers(): Free header memory when failing to get the request destination.
+            Reported by Joshua Rogers (Opera) who also provided the fix. Commit 0509c58045. OVE-20211201-0002.
+            CVE-2021-44541.</p>
+          </li>
+          <li>
+            <p>send_http_request(): Prevent memory leaks when handling errors Reported by Joshua Rogers (Opera) who
+            also provided the fix. Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542.</p>
+          </li>
+        </ul>
+      </li>
       <li>
         <p>Bug fixes:</p>
         <ul>
@@ -51,11 +74,6 @@
             pattern while Privoxy has been compiled without FEATURE_PCRE_HOST_PATTERNS. Closes: SF patch request #147.
             Patch by Maxim Antonov.</p>
           </li>
-          <li>
-            <p>Establish the TLS connection with the client earlier and decide how to route the request afterwards.
-            This allows to change the forwarding settings based on information from the https-inspected request, for
-            example the path.</p>
-          </li>
           <li>
             <p>Adjust build_request_line() to create a CONNECT request line when https-inspecting and forwarding to a
             HTTP proxy. Fixes SF bug #925 reported by Wen Yue.</p>
@@ -63,59 +81,79 @@
           <li>
             <p>load_config(): Add a space that was missing in a log message.</p>
           </li>
+          <li>
+            <p>read_http_request_body(): Fix two error messages that used an incorrect variable.</p>
+          </li>
+          <li>
+            <p>If the the response is chunk-encoded, ignore the Content-Length header sent by the server. Allows to
+            load https://redmine.lighttpd.net/ with filtering enabled.</p>
+          </li>
         </ul>
       </li>
       <li>
         <p>General improvements:</p>
         <ul>
           <li>
-            <p>serve(): Close the client socket as well if the server socket for an inspected connection has been
-            closed. Privoxy currently can't establish a new server connection when the client socket is reused and
-            would drop the connection in continue_https_chat() anyway.</p>
+            <p>Allow to edit the add-header action through the CGI editor by generalizing the code that got added with
+            the suppress-tag action. Closes SF patch request #146. Patch by Maxim Antonov.</p>
           </li>
           <li>
-            <p>Don't disable redirect checkers in redirect_url() Disable them in handle_established_connection()
-            instead. Doing it in redirect_url() prevented the +redirect{} and +fast-redirects{} actions from being
-            logged with LOG_LEVEL_ACTIONS.</p>
+            <p>Add a CGI handler for /wpad.dat that returns a Proxy Auto-Configuration (PAC) file. Among other things,
+            it can be used to instruct clients through DHCP to use Privoxy as proxy. For example with the dnsmasq
+            option: dhcp-option=252,http://config.privoxy.org/wpad.dat Initial patch by Richard Schneidt.</p>
           </li>
           <li>
-            <p>handle_established_connection(): Slightly improve a comment</p>
+            <p>Don't log the applied actions in process_encrypted_request() Log them in continue_https_chat() instead
+            to mirror chat(). Prevents the applied actions from getting logged twice for the first request on an
+            https-inspected connection.</p>
           </li>
           <li>
-            <p>handle_established_connection(): Fix a comment</p>
+            <p>OpenSSL generate_host_certificate(): Use config.privoxy.org as Common Name Org and Org Unit if the real
+            host name is too long to get accepted by OpenSSL. Clients should only care about the Subject Alternative
+            Name anyway and we can continue to use the real host name for it. Reported by Miles Wen on
+            privoxy-users@.</p>
           </li>
           <li>
-            <p>socks5_connect(): Fix indentation.</p>
+            <p>Establish the TLS connection with the client earlier and decide how to route the request afterwards.
+            This allows to change the forwarding settings based on information from the https-inspected request, for
+            example the path.</p>
           </li>
           <li>
-            <p>handle_established_connection(): Improve an error message</p>
+            <p>listen_loop(): When shutting down gracefully, close listening ports before waiting for the threads to
+            exit. Allows to start a second Privoxy with the same config file while the first Privoxy is still
+            running.</p>
           </li>
           <li>
-            <p>create_pattern_spec(): Fix ifdef indentation</p>
+            <p>serve(): Close the client socket as well if the server socket for an inspected connection has been
+            closed. Privoxy currently can't establish a new server connection when the client socket is reused and
+            would drop the connection in continue_https_chat() anyway.</p>
           </li>
           <li>
-            <p>Fix comment typos</p>
+            <p>Don't disable redirect checkers in redirect_url(). Disable them in handle_established_connection()
+            instead. Doing it in redirect_url() prevented the +redirect{} and +fast-redirects{} actions from being
+            logged with LOG_LEVEL_ACTIONS.</p>
           </li>
           <li>
-            <p>Add a CGI handler for /wpad.dat that returns a Proxy Auto-Configuration (PAC) file. Among other things,
-            it can be used to instruct clients through DHCP to use Privoxy as proxy. For example with the dnsmasq
-            option: dhcp-option=252,http://config.privoxy.org/wpad.dat Initial patch by Richard Schneidt.</p>
+            <p>handle_established_connection(): Slightly improve a comment.</p>
           </li>
           <li>
-            <p>listen_loop(): When shutting down gracefully, close listening ports before waiting for the threads to
-            exit. Allows to start a second Privoxy with the same config file while the first Privoxy is still
-            running.</p>
+            <p>handle_established_connection(): Fix a comment.</p>
           </li>
           <li>
-            <p>Allow to edit the add-header action through the CGI editor by generalizing the code that got added with
-            the suppress-tag action. Closes SF patch request #146. Patch by Maxim Antonov.</p>
+            <p>socks5_connect(): Fix indentation.</p>
           </li>
           <li>
-            <p>process_encrypted_request(): Improve a log message The function only processes request headers and there
-            may still be unread request body data left to process.</p>
+            <p>handle_established_connection(): Improve an error message.</p>
           </li>
           <li>
-            <p>read_http_request_body(): Fix two error messages that used an incorrect variable.</p>
+            <p>create_pattern_spec(): Fix ifdef indentation.</p>
+          </li>
+          <li>
+            <p>Fix comment typos.</p>
+          </li>
+          <li>
+            <p>process_encrypted_request(): Improve a log message. The function only processes request headers and
+            there may still be unread request body data left to process.</p>
           </li>
           <li>
             <p>chat(): Log the applied actions before deciding how to forward the request.</p>
@@ -124,7 +162,7 @@
             <p>parse_time_header(): Silence a coverity complaint when building without assertions.</p>
           </li>
           <li>
-            <p>receive_encrypted_request_headers(): Improve a log message</p>
+            <p>receive_encrypted_request_headers(): Improve a log message.</p>
           </li>
           <li>
             <p>mbedTLS get_ciphersuites_from_string(): Use strlcpy() instead of strncpy(). Previously the terminating
@@ -137,27 +175,12 @@
             doesn't know that. Get rid of several "this statement may fall through [-Wimplicit-fallthrough=]"
             warnings.</p>
           </li>
-          <li>
-            <p>If the the response is chunk-encoded, ignore the Content-Length header sent by the server. Allows to
-            load https://redmine.lighttpd.net/ with filtering enabled.</p>
-          </li>
           <li>
             <p>Store the PEM certificate in a dynamically allocated buffer when https-inspecting. Should prevent errors
             like: 2021-03-16 22:36:19.148 7f47bbfff700 Error: X509 PEM cert len 16694 is larger than buffer len 16383
             As a bonus it should slightly reduce the memory usage as most certificates are smaller than the previously
             used fixed buffer. Reported by: Wen Yue</p>
           </li>
-          <li>
-            <p>Don't log the applied actions in process_encrypted_request() Log them in continue_https_chat() instead
-            to mirror chat(). Prevents the applied actions from getting logged twice for the first request on an
-            https-inspected connection.</p>
-          </li>
-          <li>
-            <p>OpenSSL generate_host_certificate(): Use config.privoxy.org as Common Name Org and Org Unit if the real
-            host name is too long to get accepted by OpenSSL. Clients should only care about the Subject Alternative
-            Name anyway and we can continue to use the real host name for it. Reported by Miles Wen on
-            privoxy-users@.</p>
-          </li>
           <li>
             <p>OpenSSL generate_host_certificate(): Fix two error messsages.</p>
           </li>
@@ -185,16 +208,16 @@
             <p>Disable fast-redirects for idp.springer.com/.</p>
           </li>
           <li>
-            <p>Disable fast-redirects for .zeit.de/zustimmung</p>
+            <p>Disable fast-redirects for .zeit.de/zustimmung.</p>
           </li>
           <li>
-            <p>Unblock adv-archiv.dfn-cert.de/</p>
+            <p>Unblock adv-archiv.dfn-cert.de/.</p>
           </li>
           <li>
-            <p>Block requests to eu-tlp01.kameleoon.eu/</p>
+            <p>Block requests to eu-tlp01.kameleoon.eu/.</p>
           </li>
           <li>
-            <p>Block requests to fpa-events.arstechnica.com/</p>
+            <p>Block requests to fpa-events.arstechnica.com/.</p>
           </li>
           <li>
             <p>Unblock nlnet.nl/.</p>
@@ -208,45 +231,45 @@
         <p>Privoxy-Log-Parser:</p>
         <ul>
           <li>
-            <p>Highlight 'Socket timeout 3 reached: http://127.0.0.1:20000/no-filter/chunked-content/36'</p>
+            <p>Highlight 'Socket timeout 3 reached: http://127.0.0.1:20000/no-filter/chunked-content/36'.</p>
           </li>
           <li>
-            <p>Improve documentation for inactivity-detection mode</p>
+            <p>Improve documentation for inactivity-detection mode.</p>
           </li>
           <li>
-            <p>Detect date changes when looking for inactivity</p>
+            <p>Detect date changes when looking for inactivity.</p>
           </li>
           <li>
-            <p>Add a --passed-request-statistics-threshold option That can be set to get statistics for requests that
+            <p>Add a --passed-request-statistics-threshold option that can be set to get statistics for requests that
             were passed.</p>
           </li>
           <li>
-            <p>Add a "inactivity detection" mode Which can be useful for debugging purposes.</p>
+            <p>Add a "inactivity detection" mode which can be useful for debugging purposes.</p>
           </li>
           <li>
-            <p>Bump version to 0.9.4</p>
+            <p>Bump version to 0.9.4.</p>
           </li>
           <li>
-            <p>Only run print_intro() and print_outro() when syntax highlighting</p>
+            <p>Only run print_intro() and print_outro() when syntax highlighting.</p>
           </li>
           <li>
-            <p>Rephrase a sentence in the documentation</p>
+            <p>Rephrase a sentence in the documentation.</p>
           </li>
           <li>
-            <p>Highlight 'Client socket 7 is no longer usable. The server socket has been closed.'</p>
+            <p>Highlight 'Client socket 7 is no longer usable. The server socket has been closed.'.</p>
           </li>
           <li>
             <p>Clarify --statistics output by explicitly mentioning that the status codes sent by the server may differ
             from the ones in "debug 512" messages.</p>
           </li>
           <li>
-            <p>Fix typo in the --statistics output</p>
+            <p>Fix typo in the --statistics output.</p>
           </li>
           <li>
-            <p>Remove an unused variable</p>
+            <p>Remove an unused variable.</p>
           </li>
           <li>
-            <p>Highlight 'The peer notified us that the connection on socket 11 is going to be closed'</p>
+            <p>Highlight 'The peer notified us that the connection on socket 11 is going to be closed'.</p>
           </li>
         </ul>
       </li>
@@ -282,13 +305,13 @@
         <p>uagen:</p>
         <ul>
           <li>
-            <p>Bump generated Firefox version to 91 (ESR)</p>
+            <p>Bump generated Firefox version to 91 (ESR).</p>
           </li>
           <li>
-            <p>Bump version to 1.2.3</p>
+            <p>Bump version to 1.2.3.</p>
           </li>
           <li>
-            <p>Bump copyright</p>
+            <p>Bump copyright.</p>
           </li>
         </ul>
       </li>
@@ -315,7 +338,7 @@
             <p>Add configure option to enable AddressSanitizer.</p>
           </li>
           <li>
-            <p>Bump copyright</p>
+            <p>Bump copyright.</p>
           </li>
           <li>
             <p>Add a configure option to disable pcre JIT compilation. While JIT compilation makes filtering faster it
@@ -323,7 +346,7 @@
             problems when the SELinux policy does not grant Privoxy "execmem" privileges.</p>
           </li>
           <li>
-            <p>configure: Remove obsolete RPM_BASE check</p>
+            <p>configure: Remove obsolete RPM_BASE check.</p>
           </li>
         </ul>
       </li>
@@ -341,6 +364,14 @@
           </li>
         </ul>
       </li>
+      <li>
+        <p>macOS build system:</p>
+        <ul>
+          <li>
+            <p>The OSXPackageBuilder repository has been updated and can be used to create macOS packages again.</p>
+          </li>
+        </ul>
+      </li>
       <li>
         <p>Documentation:</p>
         <ul>
@@ -370,14 +401,14 @@
           </li>
           <li>
             <p>Update TODO list item #184 to note that WolfSSL support will (hopefully) appear after the 3.0.34
-            release</p>
+            release.</p>
           </li>
           <li>
             <p>Update max-client-connections's description. On modern systems other than Windows Privoxy should use
             poll() in which case the FD_SETSIZE value isn't releveant.</p>
           </li>
           <li>
-            <p>Add a warning that the socket-timeout does not apply to operations done by TLS libraries</p>
+            <p>Add a warning that the socket-timeout does not apply to operations done by TLS libraries.</p>
           </li>
           <li>
             <p>Make documentation slightly less "offensive" for some people by avoiding the word "hell".</p>
-- 
2.50.1