Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-15905: Assertion failure for TRACK_VARS_SERVER
This commit is contained in:
Christoph M. Becker 2024-09-26 15:34:22 +02:00
commit bf8c01db7f
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 14 additions and 0 deletions

View file

@ -897,6 +897,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]));