com php-src: Fixed Bug #71122 Session GC may not remove obsolete session data: ext/session/session.c

Commit: 8161230505f224449c4d4e3ff1f0c2c7ee2d040c Author: Yasuo Ohgaki <yohgaki@php.net> Tue, 15 Dec 2015 10:27:28 +0900 Parents: 9a31d70845f64fa010b88ade23410fb400a7dbed Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8161230505f224449c4d4e3ff1f0c2c7ee2d040c Log: Fixed Bug #71122 Session GC may not remove obsolete session data Bugs: https://bugs.php.net/71122 Changed paths: M ext/session/session.c Diff: diff --git a/ext/session/session.c b/ext/session/session.c index eca1ddb..4974921 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1608,9 +1608,7 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */ PS(id) = NULL; } - php_session_initialize(TSRMLS_C); - php_session_cache_limiter(TSRMLS_C); - + /* GC must be done before reading session data. */ if ((PS(mod_data) || PS(mod_user_implemented)) && PS(gc_probability) > 0) { int nrdels = -1; @@ -1624,6 +1622,9 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */ #endif } } + + php_session_initialize(TSRMLS_C); + php_session_cache_limiter(TSRMLS_C); } /* }}} */