Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-8827: Intentionally closing std handles no longer possible

Author: cmb69

NEWS

@@ -11,6 +11,9 @@ PHP                                                                        NEWS
     references). (Nicolas Grekas)
   . Fixed potential use after free in php_binary_init(). (Heiko Weber)
 
+- CLI:
+  . Fixed GH-8827 (Intentionally closing std handles no longer possible). (cmb)
+
 - COM:
   . Fixed bug GH-8778 (Integer arithmethic with large number variants fails).
     (cmb)

ext/zend_test/php_test.h

@@ -51,7 +51,6 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
 	HashTable global_weakmap;
 	int replace_zend_execute_ex;
 	int register_passes;
-	bool print_stderr_mshutdown;
 	zend_test_fiber *active_fiber;
 ZEND_END_MODULE_GLOBALS(zend_test)
 

ext/zend_test/tests/gh8575.phpt

@@ -1,9 +1,10 @@
 --TEST--
 CLI: stderr is available in mshutdown
 --SKIPIF--
-<?php if (php_sapi_name() != "cli") die('skip cli test only'); ?>
---EXTENSIONS--
-zend_test
+<?php
+if (!extension_loaded('zend-test')) die('skip zend-test extension required');
+if (php_sapi_name() != "cli") die('skip cli test only');
+?>
 --INI--
 zend_test.print_stderr_mshutdown=1
 --FILE--

sapi/cli/php_cli.c

@@ -542,11 +542,9 @@ static void cli_register_file_handles(bool no_close) /* {{{ */
 	 * extensions which write to stderr or company during mshutdown/gshutdown
 	 * won't have the expected functionality.
 	 */
-	if (no_close) {
-		if (s_in) s_in->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-		if (s_out) s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-		if (s_err) s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-	}
+	if (s_in) s_in->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+	if (s_out) s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+	if (s_err) s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
 
 	if (s_in==NULL || s_out==NULL || s_err==NULL) {
 		if (s_in) php_stream_close(s_in);
@@ -960,7 +958,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 		switch (behavior) {
 		case PHP_MODE_STANDARD:
 			if (script_file) {
-				cli_register_file_handles(/* no_close */ true);
+				cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
 			}
 
 			if (interactive) {
@@ -995,7 +993,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 			}
 			break;
 		case PHP_MODE_CLI_DIRECT:
-			cli_register_file_handles(/* no_close */ true);
+			cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
 			zend_eval_string_ex(exec_direct, NULL, "Command line code", 1);
 			break;
 
@@ -1010,7 +1008,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 					file_handle.filename = NULL;
 				}
 
-				cli_register_file_handles(/* no_close */ true);
+				cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
 
 				if (exec_begin) {
 					zend_eval_string_ex(exec_begin, NULL, "Command line begin code", 1);