Merge branch 'PHP-8.2' into PHP-8.3

iluuu1994 · iluuu1994 · commit 77f770871b7c · 2024-10-14T13:34:21.000+02:00
* PHP-8.2:
  Skip shebang in cli-server router script
diff --git a/NEWS b/NEWS
@@ -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)
 
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -2280,6 +2280,7 @@ static bool php_cli_server_dispatch_router(php_cli_server *server, php_cli_serve`
`2280`	`2280`	`}`
`2281`	`2281`
`2282`	`2282`	`ZVAL_UNDEF(&retval);`
	`2283`	`+ CG(skip_shebang) = true;`
`2283`	`2284`	`if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) {`
`2284`	`2285`	`if (Z_TYPE(retval) != IS_UNDEF) {`
`2285`	`2286`	`decline = Z_TYPE(retval) == IS_FALSE;`