MFH: Fixed bug #25429 (fix copying of stdin using copy() function)

diff --git a/NEWS b/NEWS
index 4f71142677cedbc8aad9d0caaa2475a96d968e68..ca2bca7b6abd364af1fd9c59577ac75e8274a2e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP 4                                                                      NEWS
 - 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)

diff --git a/main/streams.c b/main/streams.c
index 2b1ebd39cf72eb50b2cd27765574ef3ca655bd45..df4b18a46cc9a2c1f5cf6d9bf156883e948b4368 100755 (executable)
--- a/main/streams.c
+++ b/main/streams.c
@@ -1263,6 +1263,9 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size
                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;