sync with trunk, needs compat info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1651665 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_proxy_fcgi.xml b/docs/manual/mod/mod_proxy_fcgi.xml
index 3c4d0760233f2ef38948ea4fc79c6f2621d0a2c7..0491df85b5c83193fd8fd9aba2a35a7641622807 100644 (file)
--- a/docs/manual/mod/mod_proxy_fcgi.xml
+++ b/docs/manual/mod/mod_proxy_fcgi.xml
@@ -126,12 +126,29 @@ ProxyPass /myapp/ balancer://myappcluster/
        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.
+       local filesystem result is passed to the backend.  When FastCGI is 
+       configured this way, the server can calculate the most accurate
+       PATH_INFO.
       </p>
     <example><title>Proxy via Handler</title>
       <highlight language="config">
 &lt;FilesMatch \.php$&gt;
+    # 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;
+
+&lt;FilesMatch ...&gt;
+    SetHandler  "proxy:fcgi://localhost:9000"
+&lt;/FilesMatch&gt;
+
+&lt;FilesMatch ...&gt;
+    SetHandler  "proxy:balancer://myappcluster/"
 &lt;/FilesMatch&gt;
       </highlight>
    </example>
@@ -144,8 +161,10 @@ ProxyPass /myapp/ balancer://myappcluster/
     provider:</p>
     <dl>
         <dt>proxy-fcgi-pathinfo</dt>
-        <dd>By default <module>mod_proxy_fcgi</module> will neither create
-        nor export the <var>PATH_INFO</var> environment variable. This allows
+        <dd>When configured via <directive module="mod_proxy"
+        >ProxyPass</directive> or  <directive module="mod_proxy"
+        >ProxyPassMatch</directive>, <module>mod_proxy_fcgi</module> will not
+        set the <var>PATH_INFO</var> environment variable. This allows
         the backend FCGI server to correctly determine <var>SCRIPT_NAME</var>
         and <var>Script-URI</var> and be compliant with RFC 3875 section 3.3.
         If instead you need <module>mod_proxy_fcgi</module> to generate