From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- server/conf/php_fpm_pool.conf.master | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index 9bd7a3b..2ef6417 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -34,7 +34,9 @@ <tmpl_if name='security_level' op='==' value='20'> <tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> +<tmpl_if name='custom_session_save_path' op='!=' value='y'> php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp +</tmpl_if> php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -f webmaster@<tmpl_var name='domain'>" </tmpl_if> -- Gitblit v1.9.1