php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong gc sequence

Browse Source
This commit is contained in:
Anatol Belski
2016-01-29 15:18:59 +01:00
parent ee49df011c
commit d2c752d7e9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/session/session.c
View File

@@ -543,9 +543,6 @@ static void php_session_initialize(void) /* {{{ */
php_session_reset_id();
PS(session_status) = php_session_active;
/* GC must be done before read */
php_session_gc();
/* Read data */
php_session_track_init();
if (PS(mod)->s_read(&PS(mod_data), PS(id), &val, PS(gc_maxlifetime)) == FAILURE) {
@@ -555,6 +552,10 @@ static void php_session_initialize(void) /* {{{ */
php_error_docref(NULL, E_NOTICE, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path));
*/
}
/* GC must be done after read */
php_session_gc();
if (PS(session_vars)) {
zend_string_release(PS(session_vars));
PS(session_vars) = NULL;