maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

escape possible dots in extension (e.g. to allow .php.xml or similar)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-01-10 15:49:07 +01:00
parent eed3a91385
commit 29433ce963
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -334,7 +334,7 @@ class apache extends HttpConfigBase
$filesmatch .= substr($ext, 1).'|'; $filesmatch .= substr($ext, 1).'|';
} }
// start block, cut off last pipe and close block // start block, cut off last pipe and close block
$filesmatch = '('.substr($filesmatch, 0, -1).')'; $filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
$this->virtualhosts_data[$vhosts_filename] .= ' <FilesMatch \.'.$filesmatch.'$>'. "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' <FilesMatch \.'.$filesmatch.'$>'. "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' SetHandler proxy:unix:' . $php->getInterface()->getSocketFile() . '|fcgi://localhost' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' SetHandler proxy:unix:' . $php->getInterface()->getSocketFile() . '|fcgi://localhost' . "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' </FilesMatch>' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' </FilesMatch>' . "\n";

2
scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -51,7 +51,7 @@ class apache_fcgid extends apache
$filesmatch .= substr($ext, 1).'|'; $filesmatch .= substr($ext, 1).'|';
} }
// start block, cut off last pipe and close block // start block, cut off last pipe and close block
$filesmatch = '('.substr($filesmatch, 0, -1).')'; $filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
$php_options_text.= ' <FilesMatch \.'.$filesmatch.'$>'. "\n"; $php_options_text.= ' <FilesMatch \.'.$filesmatch.'$>'. "\n";
$php_options_text.= ' SetHandler proxy:unix:' . $php->getInterface()->getSocketFile() . '|fcgi://localhost'. "\n"; $php_options_text.= ' SetHandler proxy:unix:' . $php->getInterface()->getSocketFile() . '|fcgi://localhost'. "\n";
$php_options_text.= ' </FilesMatch>' . "\n"; $php_options_text.= ' </FilesMatch>' . "\n";