From 0f603d772c5bcf90d9bad5aca571cbe05fc76af9 Mon Sep 17 00:00:00 2001 From: ftimme Date: Tue, 29 May 2012 13:17:36 +0000 Subject: [PATCH] - Fixed bug for custom php.ini settings for PHP-FPM where "1" and "on" were interpreted as "off". --- server/plugins-available/apache2_plugin.inc.php | 6 +++--- server/plugins-available/nginx_plugin.inc.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 30eecfea3..bb9e245f7 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -2048,12 +2048,12 @@ class apache2_plugin { $value = escapeshellcmd(trim($value)); $key = escapeshellcmd(trim($key)); switch (strtolower($value)) { - case 'on': - case 'off': - case '1': case '0': // PHP-FPM might complain about invalid boolean value if you use 0 $value = 'off'; + case '1': + case 'on': + case 'off': case 'true': case 'false': case 'yes': diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index af5972ea2..9d444f556 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1662,12 +1662,12 @@ class nginx_plugin { $value = escapeshellcmd(trim($value)); $key = escapeshellcmd(trim($key)); switch (strtolower($value)) { - case 'on': - case 'off': - case '1': case '0': // PHP-FPM might complain about invalid boolean value if you use 0 $value = 'off'; + case '1': + case 'on': + case 'off': case 'true': case 'false': case 'yes': -- GitLab