From: Eric Covener <covener@apache.org>
Date: Mon, 24 Nov 2014 12:47:27 +0000 (+0000)
Subject: Merge r1641311, r1641382 from trunk:
X-Git-Tag: 2.4.11~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24225d293c5856303e68edaeb2bdbe4a1c8ead35;p=apache

Merge r1641311, r1641382 from trunk:

surprising but confirmed by comment in mod_proxy



test/document php-fpm with proxy_fcgi




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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index e1ead4d752..8f3c2a65b1 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1521,6 +1521,13 @@ ProxyPassReverse  /mirror/foo/ https://backend.example.com/</pre>
     <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive with the
     <code>[P]</code> flag.</p>
 
+    <div class="note">
+      <h3>Default Substitution</h3>
+      <p>When the URL parameter doesn't use any backreferences into the regular
+      expression, the original URL will be appended to the URL parameter.
+      </p>
+    </div>
+
     <div class="warning">
       <h3>Security Warning</h3>
       <p>Take care when constructing the target URL of the rule, considering
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e28e3be300..11e72edebd 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -1375,6 +1375,13 @@ ProxyPassReverse  /mirror/foo/ https://backend.example.com/
     <directive module="mod_rewrite">RewriteRule</directive> directive with the
     <code>[P]</code> flag.</p>
 
+    <note>
+      <title>Default Substitution</title>
+      <p>When the URL parameter doesn't use any backreferences into the regular
+      expression, the original URL will be appended to the URL parameter.
+      </p>
+    </note>
+
     <note type="warning">
       <title>Security Warning</title>
       <p>Take care when constructing the target URL of the rule, considering
diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en
index 4cfca11425..fa797d6d94 100644
--- a/docs/manual/mod/mod_proxy_fcgi.html.en
+++ b/docs/manual/mod/mod_proxy_fcgi.html.en
@@ -91,6 +91,20 @@
     <div class="example"><h3>Single application instance, no connection reuse</h3><pre class="prettyprint lang-config">ProxyPass /myapp/ fcgi://localhost:4000/ disablereuse=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 
+    to the 2nd parameter. The hostname and port following fcgi:// are where
+    PHP-FPM is listening.</p>
+    <div class="example"><h3>PHP-FPM</h3><pre class="prettyprint lang-config">ProxyPassMatch ^/myapp/.*\.php(/.*)?$ fcgi://localhost:9000/var/www/</pre>
+</div>
+
+    <p> The following example passes the request URI as a filesystem
+    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 fci:// are ignored.</p>
+    <div class="example"><h3>PHP-FPM with UDS</h3><pre class="prettyprint lang-config">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
     at least one load balancer algorithm module, such as
     <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code>, in addition to the proxy
diff --git a/docs/manual/mod/mod_proxy_fcgi.xml b/docs/manual/mod/mod_proxy_fcgi.xml
index fb3c7f8b54..575babc717 100644
--- a/docs/manual/mod/mod_proxy_fcgi.xml
+++ b/docs/manual/mod/mod_proxy_fcgi.xml
@@ -85,6 +85,26 @@
       </highlight>
     </example>
 
+    <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.</p>
+    <example><title>PHP-FPM</title>
+    <highlight language="config">
+      ProxyPassMatch ^/myapp/.*\.php(/.*)?$ fcgi://localhost:9000/var/www/
+    </highlight>
+    </example>
+
+    <p> The following example passes the request URI as a filesystem
+    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 fci:// are ignored.</p>
+    <example><title>PHP-FPM with UDS</title>
+    <highlight language="config">
+      ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/"
+    </highlight>
+    </example>
+
     <p>The balanced gateway needs <module>mod_proxy_balancer</module> and
     at least one load balancer algorithm module, such as
     <module>mod_lbmethod_byrequests</module>, in addition to the proxy