diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-23 13:13:43 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-23 13:13:43 +0100 |
commit | 733b5143261ec5d54647632dc3493f37608c206d (patch) | |
tree | 3c8f14a91dac0535c095008e71dc90080ff80524 | |
parent | 90be86fc91338bb34b5099bba233acf363f6a8bf (diff) | |
parent | 688e56d0ac6446dcdac2621c26586eb2de92f9b0 (diff) | |
download | php-git-733b5143261ec5d54647632dc3493f37608c206d.tar.gz |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Properly initialize PS(mod) on RINIT
-rw-r--r-- | ext/session/session.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index a79569c5ea..01e6a8fd30 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2691,7 +2691,8 @@ static int php_rinit_session(zend_bool auto_start) /* {{{ */ { php_rinit_session_globals(); - if (PS(mod) == NULL) { + PS(mod) = NULL; + { char *value; value = zend_ini_string("session.save_handler", sizeof("session.save_handler") - 1, 0); |