summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-03-23 13:14:49 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-03-23 13:14:49 +0100
commitf4412f56a2bc28cb1be36db03dc90b829aa7209b (patch)
tree6b752cb42127a2f636ff89ec241ea5b74c7fce34
parent617276d8074e849dcbf879231aef611ca1e52506 (diff)
parent733b5143261ec5d54647632dc3493f37608c206d (diff)
downloadphp-git-f4412f56a2bc28cb1be36db03dc90b829aa7209b.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Properly initialize PS(mod) on RINIT
-rw-r--r--ext/session/session.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index 286d108d64..958f17ec81 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2691,7 +2691,8 @@ static int php_rinit_session(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);