From 4e5d3d1fe30dd837335942dd8ce0dbe9bf847504 Mon Sep 17 00:00:00 2001
From: Martin <martin@enavn.com>
Date: Tue, 21 Feb 2017 15:43:00 +0100
Subject: [PATCH 1/2] Let apache handle error document for php files that
 desn't exist and not fpm

---
 server/conf/vhost.conf.master | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 9faa2b1c7b..a303313d3a 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -339,12 +339,24 @@
 			    </Directory>
 				<Directory {tmpl_var name='web_document_root_www'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+                                    SetHandler php5-fcgi
+                            </If>
+                    <tmpl_else>
+                            SetHandler php5-fcgi
+                    </tmpl_if>
 					</FilesMatch>
 				</Directory>
 				<Directory {tmpl_var name='web_document_root'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+                                    SetHandler php5-fcgi
+                            </If>
+                    <tmpl_else>
+                            SetHandler php5-fcgi
+                    </tmpl_if>
 					</FilesMatch>
 				</Directory>
                 Action php5-fcgi /php5-fcgi virtual
@@ -361,7 +373,13 @@
 			#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
 			<Directory {tmpl_var name='web_document_root'}>
 				<FilesMatch "\.php[345]?$">
-						SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
+                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+                                    SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
+                            </If>
+                    <tmpl_else>
+                            SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
+                    </tmpl_if>
 				</FilesMatch>
 			</Directory>
 </tmpl_if>
@@ -369,7 +387,13 @@
 			#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ unix://<tmpl_var name='fpm_socket'>|fcgi://localhost/<tmpl_var name='web_document_root'>/$1
 			<Directory {tmpl_var name='web_document_root'}>
 				<FilesMatch "\.php[345]?$">
-						SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
+                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+                                    SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
+                            </If>
+                    <tmpl_else>
+                            SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
+                    </tmpl_if>
 				</FilesMatch>
 			</Directory>
 </tmpl_if>
-- 
GitLab


From bd95906e6396ddecda1570f2ffdfb0d83095a629 Mon Sep 17 00:00:00 2001
From: Martin <martin@enavn.com>
Date: Tue, 21 Feb 2017 15:55:14 +0100
Subject: [PATCH 2/2] Update vhost.conf.master

---
 server/conf/vhost.conf.master | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index a303313d3a..dcfea49842 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -341,7 +341,7 @@
 					<FilesMatch "\.php[345]?$">
                     <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
                             <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                    SetHandler php5-fcgi
+                                SetHandler php5-fcgi
                             </If>
                     <tmpl_else>
                             SetHandler php5-fcgi
@@ -352,7 +352,7 @@
 					<FilesMatch "\.php[345]?$">
                     <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
                             <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                    SetHandler php5-fcgi
+                                SetHandler php5-fcgi
                             </If>
                     <tmpl_else>
                             SetHandler php5-fcgi
-- 
GitLab