diff options
| author | Anatol Belski <ab@php.net> | 2017-07-26 13:21:20 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-26 13:21:20 +0200 |
| commit | 9ff48011593bb841fbc6c98878d4a177aa24b964 (patch) | |
| tree | 70ec92a49bf6356463542c94f1d4c0330a0d5658 /ext/session/session.c | |
| parent | d3060a00d1b6c6e0cd5d5c54838dfd571317f1d7 (diff) | |
| parent | eaf5c7cdd4267e4b31732500a464546a9eae5b88 (diff) | |
| download | php-git-9ff48011593bb841fbc6c98878d4a177aa24b964.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #74833, SID constant created with wrong module number
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index f359c1faf9..2ae78bdf06 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -105,6 +105,9 @@ zend_class_entry *php_session_update_timestamp_iface_entry; static int php_session_send_cookie(void); static int php_session_abort(void); +/* Initialized in MINIT, readonly otherwise. */ +static int my_module_number = 0; + /* Dispatched by RINIT and by php_session_destroy */ static inline void php_rinit_session_globals(void) /* {{{ */ { @@ -118,6 +121,7 @@ static inline void php_rinit_session_globals(void) /* {{{ */ PS(mod_user_is_open) = 0; PS(define_sid) = 1; PS(session_vars) = NULL; + PS(module_number) = my_module_number; ZVAL_UNDEF(&PS(http_session_vars)); } /* }}} */ @@ -2840,7 +2844,8 @@ static PHP_MINIT_FUNCTION(session) /* {{{ */ zend_register_auto_global(zend_string_init("_SESSION", sizeof("_SESSION") - 1, 1), 0, NULL); - PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */ + my_module_number = module_number; + PS(module_number) = module_number; PS(session_status) = php_session_none; REGISTER_INI_ENTRIES(); |