You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2014/11/24 13:47:27 UTC
svn commit: r1641383 - in /httpd/httpd/branches/2.4.x/docs/manual/mod:
mod_proxy.html.en mod_proxy.xml mod_proxy_fcgi.html.en mod_proxy_fcgi.xml
Author: covener
Date: Mon Nov 24 12:47:27 2014
New Revision: 1641383
URL: http://svn.apache.org/r1641383
Log:
Merge r1641311, r1641382 from trunk:
surprising but confirmed by comment in mod_proxy
test/document php-fpm with proxy_fcgi
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en?rev=1641383&r1=1641382&r2=1641383&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en Mon Nov 24 12:47:27 2014
@@ -1521,6 +1521,13 @@ ProxyPassReverse /mirror/foo/ https://b
<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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1641383&r1=1641382&r2=1641383&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Mon Nov 24 12:47:27 2014
@@ -1375,6 +1375,13 @@ ProxyPassReverse /mirror/foo/ https://b
<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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en?rev=1641383&r1=1641382&r2=1641383&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en Mon Nov 24 12:47:27 2014
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml?rev=1641383&r1=1641382&r2=1641383&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.xml Mon Nov 24 12:47:27 2014
@@ -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