cvs: php-src(PHP_4_3) /main streams.c

From: Date: Sat, 10 Jul 2004 10:54:28 +0000
Subject: cvs: php-src(PHP_4_3) /main streams.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-27779@lists.php.net to get a copy of this message
wez Sat Jul 10 06:54:28 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main streams.c Log: MFH: RIP: Greedy read problems http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.91&r2=1.125.2.92&ty=u Index: php-src/main/streams.c diff -u php-src/main/streams.c:1.125.2.91 php-src/main/streams.c:1.125.2.92 --- php-src/main/streams.c:1.125.2.91 Tue Jun 29 17:51:28 2004 +++ php-src/main/streams.c Sat Jul 10 06:54:27 2004 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.125.2.91 2004/06/29 21:51:28 wez Exp $ */ +/* $Id: streams.c,v 1.125.2.92 2004/07/10 10:54:27 wez Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -55,6 +55,8 @@ #define PHP_STDIOP_GET_FD(anfd, data) anfd = (data)->file ? fileno((data)->file) : (data)->fd +static php_stream_wrapper php_plain_files_wrapper; + /* {{{ some macros to help track leaks */ #if ZEND_DEBUG #define emalloc_rel_orig(size) \ @@ -648,7 +650,8 @@ } /* just break anyway, to avoid greedy read */ - break; + if (stream->wrapper != &php_plain_files_wrapper) + break; } if (didread > 0)

« previous php.cvs (#27779) next »