Imported Upstream version 2.4.23upstream

1 files changed, 22 insertions, 21 deletions

diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en
index 17a33f74..62defada 100644
--- a/docs/manual/mod/mod_proxy_fcgi.html.en
+++ b/docs/manual/mod/mod_proxy_fcgi.html.en
@@ -65,12 +65,12 @@
 </ul><h3 class="directives">Directives</h3>
 <p>This module provides no
             directives.</p>
-<h3>See also</h3>
+<h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&amp;list_id=144532&amp;product=Apache%20httpd-2&amp;query_format=specific&amp;order=changeddate%20DESC%2Cpriority%2Cbug_severity&amp;component=mod_proxy_fcgi">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&amp;component=mod_proxy_fcgi">Report a bug</a></li></ul><h3>See also</h3>
 <ul class="seealso">
 <li><code class="program"><a href="../programs/fcgistarter.html">fcgistarter</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
 <li><code class="module"><a href="../mod/mod_authnz_fcgi.html">mod_authnz_fcgi</a></code></li>
-</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+<li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="examples" id="examples">Examples</a></h2>
@@ -90,8 +90,8 @@
     <div class="example"><h3>Single application instance, connection reuse (2.4.11 and later)</h3><pre class="prettyprint lang-config">ProxyPass "/myapp/" "fcgi://localhost:4000/" enablereuse=on</pre>
 </div>
 
-    <p> The following example passes the request URI as a filesystem 
-    path for the PHP-FPM daemon to run. The request URL is implicitly added 
+    <p> The following example passes the request URI as a filesystem
+    path for the PHP-FPM daemon to run. The request URL is implicitly added
     to the 2nd parameter. The hostname and port following fcgi:// are where
     PHP-FPM is listening.  Connection pooling is enabled.</p>
     <div class="example"><h3>PHP-FPM</h3><pre class="prettyprint lang-config">ProxyPassMatch "^/myapp/.*\.php(/.*)?$" "fcgi://localhost:9000/var/www/" enablereuse=on</pre>
@@ -101,8 +101,8 @@
     path for the PHP-FPM daemon to run. In this case, PHP-FPM is listening on
     a unix domain socket (UDS).  Requires 2.4.9 or later. With this syntax,
     the hostname and optional port following fcgi:// are ignored.</p>
-    <div class="example"><h3>PHP-FPM with UDS</h3><pre class="prettyprint lang-config">      # UDS does not currently support connection reuse
-      ProxyPassMatch "^/(.*\.php(/.*)?)$" "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/"</pre>
+    <div class="example"><h3>PHP-FPM with UDS</h3><pre class="prettyprint lang-config"># UDS does not currently support connection reuse
+ProxyPassMatch "^/(.*\.php(/.*)?)$" "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/"</pre>
 </div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
@@ -124,9 +124,9 @@
         specified FastCGI server using reverse proxy.
         This feature is available in Apache HTTP Server 2.4.10 and later. For performance
        reasons, you will want to define a <a href="mod_proxy.html#workers">worker</a>
-       representing the same fcgi:// backend. The benefit of this form is that it 
-       allows the normal mapping of URI to filename to occur in the server, and the 
-       local filesystem result is passed to the backend.  When FastCGI is 
+       representing the same fcgi:// backend. The benefit of this form is that it
+       allows the normal mapping of URI to filename to occur in the server, and the
+       local filesystem result is passed to the backend.  When FastCGI is
        configured this way, the server can calculate the most accurate
        PATH_INFO.
       </p>
@@ -134,12 +134,13 @@
     # Note: The only part that varies is /path/to/app.sock
     SetHandler  "proxy:unix:/path/to/app.sock|fcgi://localhost/"
 &lt;/FilesMatch&gt;
-   # Define a matching worker.
-   # The part that is matched to the SetHandler is the part that 
-   # follows the pipe. If you need to distinguish, "localhost; can
-   # be anything unique.
-   &lt;Proxy "fcgi://localhost/" enablereuse=on max=10&gt;
-   &lt;/Proxy&gt;
+
+# Define a matching worker.
+# The part that is matched to the SetHandler is the part that
+# follows the pipe. If you need to distinguish, "localhost; can
+# be anything unique.
+&lt;Proxy "fcgi://localhost/" enablereuse=on max=10&gt;
+&lt;/Proxy&gt;
 
 &lt;FilesMatch ...&gt;
     SetHandler  "proxy:fcgi://localhost:9000"
@@ -169,19 +170,19 @@
         is chosen (In 2.4.11 and later only):
         <dl>
           <dt>first-dot</dt>
-          <dd>PATH_INFO is split from the slash following the 
+          <dd>PATH_INFO is split from the slash following the
               <em>first</em> "." in the URL.</dd>
           <dt>last-dot</dt>
-          <dd>PATH_INFO is split from the slash following the 
+          <dd>PATH_INFO is split from the slash following the
               <em>last</em> "." in the URL.</dd>
-          <dt>full</dt> 
-          <dd>PATH_INFO is calculated by an attempt to map the URL to the 
+          <dt>full</dt>
+          <dd>PATH_INFO is calculated by an attempt to map the URL to the
               local filesystem.</dd>
           <dt>unescape</dt>
-          <dd>PATH_INFO is the path component of the URL, unescaped / 
+          <dd>PATH_INFO is the path component of the URL, unescaped /
               decoded.</dd>
           <dt>any other value</dt>
-          <dd>PATH_INFO is the same as the path component of the URL.  
+          <dd>PATH_INFO is the same as the path component of the URL.
               Originally, this was the only proxy-fcgi-pathinfo option.</dd>
          </dl>
         </dd>