archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-15905: Assertion failure for TRACK_VARS_SERVER
This commit is contained in:
Christoph M. Becker 2024-09-26 15:36:11 +02:00
commit d7030c2758
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
main/php_variables.c
View file

@ -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]));

12
tests/basic/gh15905.phpt Normal file
View file

@ -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