[Fix] Custom php cfg from .user.ini wasn't loaded by php-fpm when placed in subfolders

Lupul · Lupul · commit 004ec8a7f0a5 · 2020-02-13T03:58:58.000+02:00
diff --git a/install/deb/multiphp/apache2/PHP-56.stpl b/install/deb/multiphp/apache2/PHP-56.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-56.tpl b/install/deb/multiphp/apache2/PHP-56.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-70.stpl b/install/deb/multiphp/apache2/PHP-70.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-70.tpl b/install/deb/multiphp/apache2/PHP-70.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-71.stpl b/install/deb/multiphp/apache2/PHP-71.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-71.tpl b/install/deb/multiphp/apache2/PHP-71.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-72.stpl b/install/deb/multiphp/apache2/PHP-72.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-72.tpl b/install/deb/multiphp/apache2/PHP-72.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-73.stpl b/install/deb/multiphp/apache2/PHP-73.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-73.tpl b/install/deb/multiphp/apache2/PHP-73.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-74.stpl b/install/deb/multiphp/apache2/PHP-74.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/multiphp/apache2/PHP-74.tpl b/install/deb/multiphp/apache2/PHP-74.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/"
+        SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/templates/web/apache2/php-fpm/default.stpl b/install/deb/templates/web/apache2/php-fpm/default.stpl
@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:%backend_lsnr%|fcgi://localhost/"
+        SetHandler "proxy:%backend_lsnr%|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
diff --git a/install/deb/templates/web/apache2/php-fpm/default.tpl b/install/deb/templates/web/apache2/php-fpm/default.tpl
@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:%backend_lsnr%|fcgi://localhost/"
+        SetHandler "proxy:%backend_lsnr%|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
