- make session.save_path overridable in php-fpm (Fixes #3791)

Marius Burkard · Marius Burkard · commit 9fd93035af2c · 2016-03-02T19:38:54.000+01:00
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
@@ -34,7 +34,7 @@ env[TEMP] = <tmpl_var name='document_root'>/tmp
 
 <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'>
-php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp
+<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>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -3146,6 +3146,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 			}
 		}
 		
+		$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 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 					$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 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 				}
 			}
 		}
-
+		
+		$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
@@ -2757,6 +2757,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 			}
 		}
 		
+		$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 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 					$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 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 			}
 		}
 
+		$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());

Original file line number	Diff line number	Diff line change
`@@ -3146,6 +3146,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3146`	`3146`	`}`
`3147`	`3147`	`}`
`3148`	`3148`
	`3149`	`+ $custom_session_save_path = false;`
`3149`	`3150`	`if($custom_php_ini_settings != ''){`
`3150`	`3151`	`// Make sure we only have Unix linebreaks`
`3151`	`3152`	`$custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings);`
`@@ -3161,6 +3162,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3161`	`3162`	`$value = trim($value);`
`3162`	`3163`	`if($value != ''){`
`3163`	`3164`	`$key = trim($key);`
	`3165`	`+ if($key == 'session.save_path') $custom_session_save_path = true;`
`3164`	`3166`	`switch (strtolower($value)) {`
`3165`	`3167`	`case '0':`
`3166`	`3168`	`// PHP-FPM might complain about invalid boolean value if you use 0`
`@@ -3181,7 +3183,9 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3181`	`3183`	`}`
`3182`	`3184`	`}`
`3183`	`3185`	`}`
`3184`		`-`
	`3186`	`+`
	`3187`	`+ $tpl->setVar('custom_session_save_path', ($custom_session_save_path ? 'y' : 'n'));`
	`3188`	`+`
`3185`	`3189`	`$tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings);`
`3186`	`3190`
`3187`	`3191`	`$app->system->file_put_contents($pool_dir.$pool_name.'.conf', $tpl->grab());`
Original file line number	Diff line number	Diff line change
`@@ -2757,6 +2757,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`2757`	`2757`	`}`
`2758`	`2758`	`}`
`2759`	`2759`
	`2760`	`+ $custom_session_save_path = false;`
`2760`	`2761`	`if($custom_php_ini_settings != ''){`
`2761`	`2762`	`// Make sure we only have Unix linebreaks`
`2762`	`2763`	`$custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings);`
`@@ -2772,6 +2773,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`2772`	`2773`	`$value = trim($value);`
`2773`	`2774`	`if($value != ''){`
`2774`	`2775`	`$key = trim($key);`
	`2776`	`+ if($key == 'session.save_path') $custom_session_save_path = true;`
`2775`	`2777`	`switch (strtolower($value)) {`
`2776`	`2778`	`case '0':`
`2777`	`2779`	`// PHP-FPM might complain about invalid boolean value if you use 0`
`@@ -2793,6 +2795,8 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`2793`	`2795`	`}`
`2794`	`2796`	`}`
`2795`	`2797`
	`2798`	`+ $tpl->setVar('custom_session_save_path', ($custom_session_save_path ? 'y' : 'n'));`
	`2799`	`+`
`2796`	`2800`	`$tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings);`
`2797`	`2801`
`2798`	`2802`	`$app->system->file_put_contents($pool_dir.$pool_name.'.conf', $tpl->grab());`