summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2009-05-16 20:23:06 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2009-05-16 20:23:06 +0000
commita2600facdddfbed954d6aacf8333cd8402a50e83 (patch)
treed197b25aad85172d29de479b4dee3b44aebe8359 /main
parent06a10f378902cb59b5e3a2efcf39d740657ed487 (diff)
downloadphp-git-a2600facdddfbed954d6aacf8333cd8402a50e83.tar.gz
MFH: Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source
is a socket)
Diffstat (limited to 'main')
-rwxr-xr-xmain/streams/streams.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index def2acec3d..77a6b6e024 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1322,11 +1322,8 @@ PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, s
if (php_stream_stat(src, &ssbuf) == 0) {
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)
+#ifdef S_ISREG
+ && S_ISREG(ssbuf.sb.st_mode)
#endif
) {
*len = 0;