MFH: fix #38199 (fclose() unable to close STDOUT and STDERR)

diff --git a/NEWS b/NEWS
index 58d706b281dec76685125c21532c3d61fdde4e3f..cbd27f78e0c6ce45ffc98a66b173c061a649181f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP                                                                        NEWS
 - Fixed bug #38315 (Constructing in the destructor causes weird behaviour).
   (Dmitry)
 - Fixed bug #38265 (heap corruption). (Dmitry)
+- Fixed bug #38199 (fclose() unable to close STDOUT and STDERR). (Tony)
 - Fixed bug #33895 (Missing math constants). (Hannes)
 - Fixed PECL bug #8112 (OCI8 persistent connections misbehave when Apache 
   process times out). (Tony)

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 54cc39b7f61d3518830027b65e1828a5bbeeb74d..e9126de4eb62357927c36bee19d55141ff5879c9 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -373,7 +373,7 @@ static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC)
                                data->file = NULL;
                        }
                } else if (data->fd != -1) {
-#ifdef PHP_DEBUG
+#if PHP_DEBUG
                        if ((data->fd == 1 || data->fd == 2) && 0 == strcmp(sapi_module.name, "cli")) {
                                /* don't close stdout or stderr in CLI in DEBUG mode, as we want to see any leaks */
                                ret = 0;