tony2001 Mon Aug 28 17:15:04 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams plain_wrapper.c
/php-src NEWS
Log:
MFH: fix #38199 (fclose() unable to close STDOUT and STDERR)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.4&r2=1.52.2.6.2.5&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.4
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.5
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.4 Tue Aug 22 06:15:26 2006
+++ php-src/main/streams/plain_wrapper.c Mon Aug 28 17:15:03 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.4 2006/08/22 06:15:26 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.5 2006/08/28 17:15:03 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -373,7 +373,7 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.221&r2=1.2027.2.547.2.222&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.221 php-src/NEWS:1.2027.2.547.2.222
--- php-src/NEWS:1.2027.2.547.2.221 Mon Aug 28 10:27:58 2006
+++ php-src/NEWS Mon Aug 28 17:15:03 2006
@@ -21,6 +21,7 @@
- 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
