Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 733b5143261e · 2021-03-23T13:13:43.000+01:00
* PHP-7.4:
  Properly initialize PS(mod) on RINIT
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2691,7 +2691,8 @@ static int php_rinit_session(zend_bool auto_start) /* {{{ */`
`2691`	`2691`	`{`
`2692`	`2692`	`php_rinit_session_globals();`
`2693`	`2693`
`2694`		`- if (PS(mod) == NULL) {`
	`2694`	`+ PS(mod) = NULL;`
	`2695`	`+ {`
`2695`	`2696`	`char *value;`
`2696`	`2697`
`2697`	`2698`	`value = zend_ini_string("session.save_handler", sizeof("session.save_handler") - 1, 0);`