clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Yasuo Ohgaki 2015-12-15 10:30:16 +09:00
commit 1e042ae4a7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/session/session.c
View File

@ -1620,9 +1620,7 @@ PHPAPI void php_session_start(void) /* {{{ */
PS(id) = NULL;
}
php_session_initialize();
php_session_cache_limiter();
/* GC must be done before reading session data. */
if ((PS(mod_data) || PS(mod_user_implemented)) && PS(gc_probability) > 0) {
int nrdels = -1;
@ -1636,6 +1634,9 @@ PHPAPI void php_session_start(void) /* {{{ */
#endif
}
}
php_session_initialize(TSRMLS_C);
php_session_cache_limiter(TSRMLS_C);
}
/* }}} */