wez Mon Apr 19 13:41:39 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/standard php_fopen_wrapper.c
Log:
Fix #27865; don't dup STDIN, STDOUT or STDERR when running under CLI.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1682&r2=1.1683&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1682 php-src/NEWS:1.1683
--- php-src/NEWS:1.1682 Mon Apr 19 11:15:49 2004
+++ php-src/NEWS Mon Apr 19 13:41:38 2004
@@ -16,6 +16,7 @@
(Dmitry)
- Fixed bug #27997 (SPL: Crash with getInnerIterator()). (Marcus)
- Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia)
+- Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez)
- Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from
class method). (Andi, Rob)
- Fixed bug #27742 (WDSL SOAP Parsing Schema bug). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.43&r2=1.44&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.43
php-src/ext/standard/php_fopen_wrapper.c:1.44
--- php-src/ext/standard/php_fopen_wrapper.c:1.43 Thu Jan 8 03:17:33 2004
+++ php-src/ext/standard/php_fopen_wrapper.c Mon Apr 19 13:41:39 2004
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrapper.c,v 1.43 2004/01/08 08:17:33 andi Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.44 2004/04/19 17:41:39 wez Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -166,11 +166,11 @@
}
if (!strcasecmp(path, "stdin")) {
- fd = dup(STDIN_FILENO);
+ fd = !strcmp(sapi_module.name, "cli") ? STDIN_FILENO :
dup(STDIN_FILENO);
} else if (!strcasecmp(path, "stdout")) {
- fd = dup(STDOUT_FILENO);
+ fd = !strcmp(sapi_module.name, "cli") ? STDOUT_FILENO :
dup(STDOUT_FILENO);
} else if (!strcasecmp(path, "stderr")) {
- fd = dup(STDERR_FILENO);
+ fd = !strcmp(sapi_module.name, "cli") ? STDERR_FILENO :
dup(STDERR_FILENO);
} else if (!strncasecmp(path, "filter/", 7)) {
/* Save time/memory when chain isn't specified */
if (strchr(mode, 'r') || strchr(mode, '+')) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
