dmitry Wed Jun 1 11:11:15 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main/streams streams.c
Log:
Disabled search of recored separator outside of buffer
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61.2.13&r2=1.61.2.14&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61.2.13
php-src/main/streams/streams.c:1.61.2.14
--- php-src/main/streams/streams.c:1.61.2.13 Mon May 23 11:37:10 2005
+++ php-src/main/streams/streams.c Wed Jun 1 11:11:15 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.61.2.13 2005/05/23 15:37:10 tony2001 Exp $ */
+/* $Id: streams.c,v 1.61.2.14 2005/06/01 15:11:15 dmitry Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -841,9 +841,9 @@
toread = maxlen;
} else {
if (delim_len == 1) {
- e = memchr(stream->readbuf + stream->readpos, *delim,
stream->readbuflen - stream->readpos);
+ e = memchr(stream->readbuf + stream->readpos, *delim,
stream->writepos - stream->readpos);
} else {
- e = php_memnstr(stream->readbuf + stream->readpos,
delim, delim_len, (stream->readbuf + stream->readbuflen));
+ e = php_memnstr(stream->readbuf + stream->readpos,
delim, delim_len, (stream->readbuf + stream->writepos));
}
if (!e) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
