Allow to not close stream on rscr dtor in php cli sapi

Author: bukka

main/php_streams.h

@@ -185,6 +185,9 @@ struct _php_stream_wrapper	{
  * Currently for internal use only. */
 #define PHP_STREAM_FLAG_SUPPRESS_ERRORS				0x100
 
+/* Do not close handle except it is explicitly closed by user (e.g. fclose) */
+#define PHP_STREAM_FLAG_NO_RSCR_DTOR_CLOSE			0x200
+
 #define PHP_STREAM_FLAG_WAS_WRITTEN					0x80000000
 
 struct _php_stream  {

main/streams/streams.c

@@ -383,7 +383,8 @@ PHPAPI int _php_stream_free(php_stream *stream, int close_options) /* {{{ */
 
 	context = PHP_STREAM_CONTEXT(stream);
 
-	if (stream->flags & PHP_STREAM_FLAG_NO_CLOSE) {
+	if ((stream->flags & PHP_STREAM_FLAG_NO_CLOSE) ||
+			((stream->flags & PHP_STREAM_FLAG_NO_RSCR_DTOR_CLOSE) && (close_options & PHP_STREAM_FREE_RSRC_DTOR))) {
 		preserve_handle = 1;
 	}
 

sapi/cli/php_cli.c

@@ -540,9 +540,9 @@ static void cli_register_file_handles(void) /* {{{ */
 	 * extensions which write to stderr or company during mshutdown/gshutdown
 	 * won't have the expected functionality.
 	 */
-	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_RSCR_DTOR_CLOSE;
+	if (s_out) s_out->flags |= PHP_STREAM_FLAG_NO_RSCR_DTOR_CLOSE;
+	if (s_err) s_err->flags |= PHP_STREAM_FLAG_NO_RSCR_DTOR_CLOSE;
 
 	if (s_in==NULL || s_out==NULL || s_err==NULL) {
 		if (s_in) php_stream_close(s_in);

sapi/cli/tests/gh8827.phpt

@@ -0,0 +1,18 @@
+--TEST--
+std handles can be deliberately closed
+--SKIPIF--
+<?php
+if (php_sapi_name() != "cli") {
+	die("skip CLI only");
+}
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	die("skip not for Windows");
+}
+?>
+--FILE--
+<?php
+fclose(STDERR);
+var_dump(@fopen('php://stderr', 'a'));
+?>
+--EXPECT--
+bool(false)