iliaa           Tue Sep  9 20:59:47 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/main       streams.c 
  Log:
  MFH: Fixed bug #25429 (fix copying of stdin using copy() function)
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.383 php-src/NEWS:1.1247.2.384
--- php-src/NEWS:1.1247.2.383   Tue Sep  9 20:22:20 2003
+++ php-src/NEWS        Tue Sep  9 20:59:45 2003
@@ -7,6 +7,7 @@
 - Fixed crash bug when non-existing save/serializer handler was used. (Jani)
 - Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
 - Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #25429 (fix copying of stdin using copy() function). (Ilia)
 - Fixed bug #25424 (ext/informix: lvarchar not supported in win32). (Jani)
 - Fixed bug #25404 (ext/pgsql: open transactions not closed when script ends). 
   (Marcus)
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.79 php-src/main/streams.c:1.125.2.80
--- php-src/main/streams.c:1.125.2.79   Tue Sep  2 06:33:18 2003
+++ php-src/main/streams.c      Tue Sep  9 20:59:46 2003
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.125.2.79 2003/09/02 10:33:18 stas Exp $ */
+/* $Id: streams.c,v 1.125.2.80 2003/09/10 00:59:46 iliaa Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1263,6 +1263,9 @@
                if (ssbuf.sb.st_size == 0
 #ifdef S_ISFIFO
                 && !S_ISFIFO(ssbuf.sb.st_mode)
+#endif
+#ifdef S_ISCHR
+                && !S_ISCHR(ssbuf.sb.st_mode)
 #endif
                ) {
                        return 1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to