cvs: php-src(PHP_4_3) /main streams.c
| From: | Wez Furlong | Date: | Tue, 29 Jun 2004 21:51:29 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27729@lists.php.net to get a copy of this message | ||
wez Tue Jun 29 17:51:29 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main streams.c
Log:
Fix for Bug #28964 fread "greedy" behaviour
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.90&r2=1.125.2.91&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.90 php-src/main/streams.c:1.125.2.91
--- php-src/main/streams.c:1.125.2.90 Mon Jun 21 15:33:48 2004
+++ php-src/main/streams.c Tue Jun 29 17:51:28 2004
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.90 2004/06/21 19:33:48 pollita Exp $ */
+/* $Id: streams.c,v 1.125.2.91 2004/06/29 21:51:28 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -646,6 +646,9 @@
if (stream->flags & PHP_STREAM_FLAG_AVOID_BLOCKING) {
break;
}
+
+ /* just break anyway, to avoid greedy read */
+ break;
}
if (didread > 0)