From ebc44a737e26188c4ca0f2c87deff93e8792a2f7 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 8 Dec 2022 23:16:27 +0100 Subject: [PATCH] trim fpm ini directives of possible newline characters Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/Php/Fpm.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Froxlor/Cron/Http/Php/Fpm.php b/lib/Froxlor/Cron/Http/Php/Fpm.php index 4ebfabb9..96721cb1 100644 --- a/lib/Froxlor/Cron/Http/Php/Fpm.php +++ b/lib/Froxlor/Cron/Http/Php/Fpm.php @@ -87,10 +87,10 @@ class Fpm private function buildIniMapping() { $this->ini = [ - 'php_flag' => explode("\n", Settings::Get('phpfpm.ini_flags')), - 'php_value' => explode("\n", Settings::Get('phpfpm.ini_values')), - 'php_admin_flag' => explode("\n", Settings::Get('phpfpm.ini_admin_flags')), - 'php_admin_value' => explode("\n", Settings::Get('phpfpm.ini_admin_values')) + 'php_flag' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_flags'))), + 'php_value' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_values'))), + 'php_admin_flag' => array_map('trim', explode("\n", Settings::Get('phpfpm.ini_admin_flags'))), + '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"; foreach ($phpini_array as $inisection) { - $is = explode("=", $inisection); + $is = explode("=", trim($inisection)); if (count($is) !== 2 || empty($is[0])) { continue; }