helly Sun Jul 17 14:39:25 2005 EDT
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
- Fix problem with debug mode on selective machines
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.48&r2=1.49&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.48
php-src/main/streams/plain_wrapper.c:1.49
--- php-src/main/streams/plain_wrapper.c:1.48 Thu Jun 23 22:04:19 2005
+++ php-src/main/streams/plain_wrapper.c Sun Jul 17 14:39:24 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.48 2005/06/24 02:04:19 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.49 2005/07/17 18:39:24 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -368,8 +368,8 @@
}
} else if (data->fd != -1) {
#ifdef PHP_DEBUG
- if (data->fd == 2 && 0 == strcmp(sapi_module.name,
"cli")) {
- /* don't close stderr in CLI in DEBUG mode, as
we want to see any leaks */
+ 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;
} else {
ret = close(data->fd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
