Marius Cramer
2015-05-19 6e1f2d5a20fd65493fc52293c669d772f287556e
Merge branch 'bug/mod_proxy_fcgi' into 'master'

ProxyPassMatch is only possible if running PHP-FPM over TCP

This fixes an error when `mod_proxy_fcgi` is installed/enabled but PHP-FPM is listening on a socket.

See merge request !189
1 files modified
6 ■■■■ changed files
server/conf/vhost.conf.master 6 ●●●● patch | view | raw | blame | history
server/conf/vhost.conf.master
@@ -349,13 +349,13 @@
                Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
                <IfModule mod_proxy_fcgi.c>
            ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
                </IfModule>
</tmpl_if>
<tmpl_if name='use_socket'>
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
</tmpl_if>
        </IfModule>
        <IfModule mod_proxy_fcgi.c>
            ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
        </IfModule>
</tmpl_if>