diff options
author | Yasuo Ohgaki <yohgaki@php.net> | 2013-08-10 18:29:29 +0900 |
---|---|---|
committer | Yasuo Ohgaki <yohgaki@php.net> | 2013-08-10 18:29:29 +0900 |
commit | 9d95a1a7d13678b5a82d7b341e3c06b651a98fe9 (patch) | |
tree | 01cb14469d85c8f4dfac5e07b70cf4462d1ae07f | |
parent | b27f6826d4d35caaf5b08e87297d13838930df94 (diff) | |
parent | e9b128c1bfb64e50c5e361959a1a7ccd176d1324 (diff) | |
download | php-git-9d95a1a7d13678b5a82d7b341e3c06b651a98fe9.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
-rw-r--r-- | ext/session/session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index c02a10d7bf..686e938af6 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -776,7 +776,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateName, session_name, php_ps_globals, ps_globals) PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler) - STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_ALL, OnUpdateBool, auto_start, php_ps_globals, ps_globals) + STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_PERDIR, OnUpdateBool, auto_start, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL, OnUpdateLong, gc_probability, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.gc_divisor", "100", PHP_INI_ALL, OnUpdateLong, gc_divisor, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, OnUpdateLong, gc_maxlifetime, php_ps_globals, ps_globals) |