cvs: php4 /main streams.c
| From: | Wez Furlong | Date: | Fri, 01 Nov 2002 04:58:23 +0000 |
| Subject: | cvs: php4 /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15695@lists.php.net to get a copy of this message | ||
wez Thu Oct 31 23:58:23 2002 EDT
Modified files:
/php4/main streams.c
Log:
Probable fix for #20180.
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.122 php4/main/streams.c:1.123
--- php4/main/streams.c:1.122 Mon Oct 28 07:37:31 2002
+++ php4/main/streams.c Thu Oct 31 23:58:23 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.122 2002/10/28 12:37:31 iliaa Exp $ */
+/* $Id: streams.c,v 1.123 2002/11/01 04:58:23 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1286,7 +1286,7 @@
if (data->fd >= 0) {
ret = read(data->fd, buf, count);
- if (ret == 0 || (ret < count && errno != EWOULDBLOCK))
+ if (ret == 0 || (ret == -1 && errno != EWOULDBLOCK))
stream->eof = 1;
} else {