From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 27 May 2016 20:39:13 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~1563
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5d695498b0cd293904862c281817c579ce6426c;p=thirdparty%2Fapache%2Fhttpd.git

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745813 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en
index 6031a5f434d..2b476df034b 100644
--- a/docs/manual/mod/mod_proxy_fcgi.html.en
+++ b/docs/manual/mod/mod_proxy_fcgi.html.en
@@ -86,7 +86,7 @@
     from httpd, you can opt-in to connection reuse as shown in the following
     example:</p>
 
-    <div class="example"><h3>Single application instance, connection reuse</h3><pre class="prettyprint lang-config">ProxyPass "/myapp/" "fcgi://localhost:4000/" enablereuse=on</pre>
+    <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
@@ -100,8 +100,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
@@ -111,9 +111,9 @@
     default, and will be used for this example configuration.</p>
 
     <div class="example"><h3>Balanced gateway to multiple application instances</h3><pre class="prettyprint lang-config">ProxyPass "/myapp/" "balancer://myappcluster/"
-&lt;Proxy balancer://myappcluster/&gt;
-    BalancerMember fcgi://localhost:4000
-    BalancerMember fcgi://localhost:4001
+&lt;Proxy "balancer://myappcluster/"&gt;
+    BalancerMember "fcgi://localhost:4000"
+    BalancerMember "fcgi://localhost:4001"
 &lt;/Proxy&gt;</pre>
 </div>
 
@@ -133,12 +133,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"
@@ -165,7 +166,7 @@
         a "best guess" for <var>PATH_INFO</var>, set this env-var.
         This is a workaround for a bug in some FCGI implementations.  This
         variable can be set to multiple values to tweak at how the best guess
-        is chosen:
+        is chosen (In 2.4.11 and later only):
         <dl>
           <dt>first-dot</dt>
           <dd>PATH_INFO is split from the slash following the