Make fread() non-greedy for socket based streams

diff --git a/main/streams.c b/main/streams.c
index bd87ddc01cb2de4f62961f0e2ce81150ff6bde93..1401e88aedba1c86389a984f0d20355b25b0b2b2 100755 (executable)
--- a/main/streams.c
+++ b/main/streams.c
@@ -642,6 +642,10 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
                        /* EOF, or temporary end of data (for non-blocking mode). */
                        break;
                }
+
+               if (stream->flags & PHP_STREAM_FLAG_AVOID_BLOCKING) {
+                       break;
+               }
        }
 
        if (didread > 0)