From 8c617732800a2281c69cc2d5e33ecbe3952bf981 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 10 Jan 2018 17:01:17 +0100
Subject: [PATCH] fix usage of extensions from limit_extensions list in
 apache-cron

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 scripts/jobs/cron_tasks.inc.http.10.apache.php       | 11 +++++++++--
 scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php | 10 +++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php
index 420e9c22..55f230d0 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -350,8 +350,15 @@ class apache extends HttpConfigBase
 							}
 							$this->virtualhosts_data[$vhosts_filename] .= '  FastCgiExternalServer ' . $php->getInterface()->getAliasConfigDir() . $srvName . ' -socket ' . $php->getInterface()->getSocketFile() . ' -idle-timeout ' . $phpconfig['fpm_settings']['idle_timeout'] . $addheader . "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '  <Directory "' . $mypath . '">' . "\n";
-							$file_extensions = explode(' ', $phpconfig['file_extensions']);
-							$this->virtualhosts_data[$vhosts_filename] .= '   <FilesMatch "\.(' . implode('|', $file_extensions) . ')$">' . "\n";
+							$filesmatch = $phpconfig['fpm_settings']['limit_extensions'];
+							$extensions = explode(" ", $filesmatch);
+							$filesmatch = "";
+							foreach ($extensions as $ext) {
+								$filesmatch .= substr($ext, 1).'|';
+							}
+							// start block, cut off last pipe and close block
+							$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
+							$this->virtualhosts_data[$vhosts_filename] .= '   <FilesMatch \.'.$filesmatch.'$>'. "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '     AddHandler php5-fastcgi .php' . "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '     Action php5-fastcgi /fastcgiphp' . "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '      Options +ExecCGI' . "\n";
diff --git a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
index 0b3119e7..acf49948 100644
--- a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
+++ b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
@@ -82,7 +82,15 @@ class apache_fcgid extends apache
 					}
 					$php_options_text.= '  FastCgiExternalServer ' . $php->getInterface()->getAliasConfigDir() . $srvName . ' -socket ' . $php->getInterface()->getSocketFile()  . ' -idle-timeout ' . $phpconfig['fpm_settings']['idle_timeout'] . $addheader . "\n";
 					$php_options_text.= '  <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
-					$php_options_text.= '    <FilesMatch "\.php$">' . "\n";
+					$filesmatch = $phpconfig['fpm_settings']['limit_extensions'];
+					$extensions = explode(" ", $filesmatch);
+					$filesmatch = "";
+					foreach ($extensions as $ext) {
+						$filesmatch .= substr($ext, 1).'|';
+					}
+					// start block, cut off last pipe and close block
+					$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
+					$php_options_text.= '    <FilesMatch \.'.$filesmatch.'$>'. "\n";
 					$php_options_text.= '      SetHandler php5-fastcgi'. "\n";
 					$php_options_text.= '      Action php5-fastcgi /fastcgiphp' . "\n";
 					$php_options_text.= '      Options +ExecCGI' . "\n";