Skip to content

Commit aaca203

Browse files
author
Till Brehm
committed
Changed apache mod_proxy_fcgi configuration in vhost.conf.master from ProxyPassMatch to SetHandler so we can wrap the config directive it into <Directory ...> to avoid side affects with globally installed applications like phpmyadmin and roundcube.
1 parent a90bc7f commit aaca203

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

server/conf/vhost.conf.master

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,20 @@
358358
</IfModule>
359359
<IfModule mod_proxy_fcgi.c>
360360
<tmpl_if name='use_tcp'>
361-
ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
361+
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
362+
<Directory {tmpl_var name='web_document_root'}>
363+
<FilesMatch "\.php[345]?$">
364+
SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
365+
</FilesMatch>
366+
</Directory>
362367
</tmpl_if>
363368
<tmpl_if name='use_socket'>
364-
ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ unix://<tmpl_var name='fpm_socket'>|fcgi://localhost/<tmpl_var name='web_document_root'>/$1
369+
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ unix://<tmpl_var name='fpm_socket'>|fcgi://localhost/<tmpl_var name='web_document_root'>/$1
370+
<Directory {tmpl_var name='web_document_root'}>
371+
<FilesMatch "\.php[345]?$">
372+
SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
373+
</FilesMatch>
374+
</Directory>
365375
</tmpl_if>
366376
</IfModule>
367377
</tmpl_if>

0 commit comments

Comments
 (0)