diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-12-15 10:30:16 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-12-15 10:30:16 +0900 |
| commit | 1e042ae4a78fa332a6869087f54c8a9a3caaa978 (patch) | |
| tree | e56aefb918f2ed83d734bce02b08a33e73231652 /ext/session/session.c | |
| parent | 56bf10f0bd9a1b2d88b4cb2ac6e45ebf46925adc (diff) | |
| parent | 8161230505f224449c4d4e3ff1f0c2c7ee2d040c (diff) | |
| download | php-git-1e042ae4a78fa332a6869087f54c8a9a3caaa978.tar.gz | |
Fix merge conflict
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 5e4831c6be..2f2f9f7e46 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -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); } /* }}} */ |