diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index 9bd7a3be3eb4aa46237a20cce46f922d6073d66a..b60eb987012cf29aa1a88ea36bda22b592c1fb11 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -34,7 +34,7 @@ env[TEMP] = /tmp php_admin_value[open_basedir] = -php_admin_value[session.save_path] = /tmp +php_admin_value[session.save_path] = /tmp php_admin_value[upload_tmp_dir] = /tmp php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -f webmaster@" diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 03e2c8ff3a07c80651ddaff1dbf3a2ecc6bee284..e6354291930e923914ed9c3392d71a6792db0920 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -3146,6 +3146,7 @@ class apache2_plugin { } } + $custom_session_save_path = false; if($custom_php_ini_settings != ''){ // Make sure we only have Unix linebreaks $custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings); @@ -3161,6 +3162,7 @@ class apache2_plugin { $value = trim($value); if($value != ''){ $key = trim($key); + if($key == 'session.save_path') $custom_session_save_path = true; switch (strtolower($value)) { case '0': // PHP-FPM might complain about invalid boolean value if you use 0 @@ -3181,7 +3183,9 @@ class apache2_plugin { } } } - + + $tpl->setVar('custom_session_save_path', ($custom_session_save_path ? 'y' : 'n')); + $tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings); $app->system->file_put_contents($pool_dir.$pool_name.'.conf', $tpl->grab()); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 8daff10314fb8f6559829dd23363e807370c2a5d..c2b2abf8865b87557d77f809adcb1903443caa4f 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -2757,6 +2757,7 @@ class nginx_plugin { } } + $custom_session_save_path = false; if($custom_php_ini_settings != ''){ // Make sure we only have Unix linebreaks $custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings); @@ -2772,6 +2773,7 @@ class nginx_plugin { $value = trim($value); if($value != ''){ $key = trim($key); + if($key == 'session.save_path') $custom_session_save_path = true; switch (strtolower($value)) { case '0': // PHP-FPM might complain about invalid boolean value if you use 0 @@ -2793,6 +2795,8 @@ class nginx_plugin { } } + $tpl->setVar('custom_session_save_path', ($custom_session_save_path ? 'y' : 'n')); + $tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings); $app->system->file_put_contents($pool_dir.$pool_name.'.conf', $tpl->grab());