minor #7415 Fix Apache 2.4 UDS instructions (dzuelke)

xabbuh · xabbuh · commit 385fe5d4359a · 2017-01-31T22:06:34.000+01:00
This PR was submitted for the 3.2 branch but it was merged into the 2.7 branch instead (closes #7415). Discussion ---------- Fix Apache 2.4 UDS instructions Supported since Apache 2.4.10 Commits ------- 25370f7 Fix Apache 2.4 UDS instructions
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
@@ -162,10 +162,9 @@ Using mod_proxy_fcgi with Apache 2.4
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you are running Apache 2.4, you can easily use ``mod_proxy_fcgi`` to pass
-incoming requests to PHP-FPM. Configure PHP-FPM to listen on a TCP socket
-(``mod_proxy`` currently `does not support Unix sockets`_), enable ``mod_proxy``
-and ``mod_proxy_fcgi`` in your Apache configuration and use the ``SetHandler``
-directive to pass requests for PHP files to PHP FPM:
+incoming requests to PHP-FPM. Configure PHP-FPM to listen on a TCP or Unix socket,
+enable ``mod_proxy`` and ``mod_proxy_fcgi`` in your Apache configuration, and
+use the ``SetHandler`` directive to pass requests for PHP files to PHP FPM:
 
 .. code-block:: apache
 
@@ -183,6 +182,8 @@ directive to pass requests for PHP files to PHP FPM:
         # with mod_rewrite or mod_autoindex
         <FilesMatch \.php$>
             SetHandler proxy:fcgi://127.0.0.1:9000
+            # for Unix sockets, Apache 2.4.10 or higher
+            # SetHandler proxy:unix:/path/to/fpm.sock|fcgi://dummy
         </FilesMatch>
 
         # If you use Apache version below 2.4.9 you must consider update or use this instead
@@ -338,6 +339,5 @@ The **minimum configuration** to get your application running under Nginx is:
 For advanced Nginx configuration options, read the official `Nginx documentation`_.
 
 .. _`Apache documentation`: http://httpd.apache.org/docs/
-.. _`does not support Unix sockets`: https://bz.apache.org/bugzilla/show_bug.cgi?id=54101
 .. _`FastCgiExternalServer`: http://www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html#FastCgiExternalServer
 .. _`Nginx documentation`: http://wiki.nginx.org/Symfony
