Merge branch 'PHP-8.4'

cmb69 · cmb69 · commit d7030c27589e · 2024-09-26T15:36:11.000+02:00
* PHP-8.4: Fix GH-15905: Assertion failure for TRACK_VARS_SERVER
diff --git a/main/php_variables.c b/main/php_variables.c
@@ -893,6 +893,7 @@ static bool php_auto_globals_create_server(zend_string *name)
 	} else {
 		zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]);
 		array_init(&PG(http_globals)[TRACK_VARS_SERVER]);
+		zend_hash_real_init_mixed(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));
 	}
 
 	check_http_proxy(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));
diff --git a/tests/basic/gh15905.phpt b/tests/basic/gh15905.phpt
@@ -0,0 +1,12 @@
+--TEST--
+GH-15905 (Assertion failure for TRACK_VARS_SERVER)
+--INI--
+variables_order=E
+auto_globals_jit=0
+register_argc_argv=1
+--FILE--
+<?php
+echo "okay\n";
+?>
+--EXPECT--
+okay

Original file line number	Diff line number	Diff line change
`@@ -893,6 +893,7 @@ static bool php_auto_globals_create_server(zend_string *name)`
`893`	`893`	`} else {`
`894`	`894`	`zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]);`
`895`	`895`	`array_init(&PG(http_globals)[TRACK_VARS_SERVER]);`
	`896`	`+ zend_hash_real_init_mixed(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));`
`896`	`897`	`}`
`897`	`898`
`898`	`899`	`check_http_proxy(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));`