Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Skip shebang in cli-server router script
This commit is contained in:
Ilija Tovilo 2024-10-14 13:34:21 +02:00
commit 77f770871b
No known key found for this signature in database
GPG Key ID: 5050C66BFCD1015A
2 changed files with 5 additions and 0 deletions

4
NEWS
View File

@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.3.14
- Cli:
. Fixed bug GH-16373 (Shebang is not skipped for router script in cli-server
started through shebang). (ilutov)
- COM:
. Fixed out of bound writes to SafeArray data. (cmb)

View File

@ -2280,6 +2280,7 @@ static bool php_cli_server_dispatch_router(php_cli_server *server, php_cli_serve
}
ZVAL_UNDEF(&retval);
CG(skip_shebang) = true;
if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) {
if (Z_TYPE(retval) != IS_UNDEF) {
decline = Z_TYPE(retval) == IS_FALSE;