dmitry Fri Nov 10 13:10:28 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Disabled reading from stream (calls to read()) after EOF
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.75&r2=1.76&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.75
php-src/main/streams/plain_wrapper.c:1.76
--- php-src/main/streams/plain_wrapper.c:1.75 Fri Nov 10 10:55:43 2006
+++ php-src/main/streams/plain_wrapper.c Fri Nov 10 13:10:28 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.75 2006/11/10 10:55:43 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.76 2006/11/10 13:10:28 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -316,6 +316,9 @@
assert(data != NULL);
if (data->fd >= 0) {
+ if (stream->eof && !data->is_pipe) {
+ return 0;
+ }
ret = read(data->fd, buf, count);
stream->eof = (ret == 0 || (ret == (size_t)-1 && errno !=
EWOULDBLOCK));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
