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

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  fix wrong gc sequence
This commit is contained in:
Anatol Belski
2016-01-29 15:19:40 +01:00
parent 55fd320b31 d2c752d7e9
commit 15ba618a69
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

@@ -557,9 +557,6 @@ static void php_session_initialize(void) /* {{{ */
php_session_reset_id();
/* 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) {
@@ -569,6 +566,10 @@ static void php_session_initialize(void) /* {{{ */
php_error_docref(NULL, E_WARNING, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path));
return;
}
/* GC must be done after read */
php_session_gc();
if (PS(session_vars)) {
zend_string_release(PS(session_vars));
PS(session_vars) = NULL;