Skip to content

Commit 89e4ff3

Browse files
author
Webslice
committed
#5387 boyscout: wrap ProxyFCGISetEnvIf in appropriate IfVersion
1 parent ff920a3 commit 89e4ff3

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

server/conf/vhost.conf.master

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,12 @@
379379
</IfModule>
380380
<IfModule mod_proxy_fcgi.c>
381381
<tmpl_if name='php_fpm_chroot' op='==' value='y'>
382-
ProxyFCGISetEnvIf "true" DOCUMENT_ROOT "<tmpl_var name='php_fpm_chroot_web_folder'>"
383-
ProxyFCGISetEnvIf "true" CONTEXT_DOCUMENT_ROOT "%{reqenv:DOCUMENT_ROOT}"
384-
ProxyFCGISetEnvIf "true" HOME "%{reqenv:DOCUMENT_ROOT}"
385-
ProxyFCGISetEnvIf "true" SCRIPT_FILENAME "%{reqenv:DOCUMENT_ROOT}%{reqenv:SCRIPT_NAME}"
382+
<IfVersion >= 2.4.26>
383+
ProxyFCGISetEnvIf "true" DOCUMENT_ROOT "<tmpl_var name='php_fpm_chroot_web_folder'>"
384+
ProxyFCGISetEnvIf "true" CONTEXT_DOCUMENT_ROOT "%{reqenv:DOCUMENT_ROOT}"
385+
ProxyFCGISetEnvIf "true" HOME "%{reqenv:DOCUMENT_ROOT}"
386+
ProxyFCGISetEnvIf "true" SCRIPT_FILENAME "%{reqenv:DOCUMENT_ROOT}%{reqenv:SCRIPT_NAME}"
387+
</IfVersion>
386388
</tmpl_if>
387389
<tmpl_if name='use_tcp'>
388390
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1

0 commit comments

Comments
 (0)