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

trim fpm ini directives of possible newline characters

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-12-08 23:16:27 +01:00
parent 4d908ff6ee
commit ebc44a737e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Froxlor/Cron/Http/Php/Fpm.php
View File

@@ -87,10 +87,10 @@ class Fpm
private function buildIniMapping() private function buildIniMapping()
{ {
$this->ini = [ $this->ini = [
'php_flag' => explode("\n", Settings::Get('phpfpm.ini_flags')), 'php_flag' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_flags'))),
'php_value' => explode("\n", Settings::Get('phpfpm.ini_values')), 'php_value' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_values'))),
'php_admin_flag' => explode("\n", Settings::Get('phpfpm.ini_admin_flags')), 'php_admin_flag' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_admin_flags'))),
'php_admin_value' => explode("\n", Settings::Get('phpfpm.ini_admin_values')) 'php_admin_value' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_admin_values')))
]; ];
} }
@@ -274,7 +274,7 @@ pm.max_children = 1
$fpm_config .= "\n\n"; $fpm_config .= "\n\n";
foreach ($phpini_array as $inisection) { foreach ($phpini_array as $inisection) {
$is = explode("=", $inisection); $is = explode("=", trim($inisection));
if (count($is) !== 2 || empty($is[0])) { if (count($is) !== 2 || empty($is[0])) {
continue; continue;
} }