php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Skip shebang in cli-server router script
This commit is contained in:
Ilija Tovilo
2024-10-14 13:35:41 +02:00
parent 3546733065 77f770871b
commit 3074cbf5b6
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

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

1
sapi/cli/php_cli_server.c
View File

@@ -2266,6 +2266,7 @@ static bool php_cli_server_dispatch_router(php_cli_server *server, php_cli_serve
int sg_options_back = SG(options); int sg_options_back = SG(options);
/* Don't chdir to the router script because the file path may be relative. */ /* Don't chdir to the router script because the file path may be relative. */
SG(options) |= SAPI_OPTION_NO_CHDIR; SG(options) |= SAPI_OPTION_NO_CHDIR;
CG(skip_shebang) = true;
bool result = php_execute_script_ex(&zfd, &retval); bool result = php_execute_script_ex(&zfd, &retval);
SG(options) = sg_options_back; SG(options) = sg_options_back;
if (result) { if (result) {