stas Sun Jun 8 18:21:59 2008 UTC
Modified files:
/php-src/main/streams streams.c
Log:
with unicode buffers, positions are in uchars
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.163&r2=1.164&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.163
php-src/main/streams/streams.c:1.164
--- php-src/main/streams/streams.c:1.163 Mon Apr 28 22:40:10 2008
+++ php-src/main/streams/streams.c Sun Jun 8 18:21:59 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.163 2008/04/28 22:40:10 cellog Exp $ */
+/* $Id: streams.c,v 1.164 2008/06/08 18:21:59 stas Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -509,7 +509,7 @@
stream->readbuflen +=
bucket->buflen;
stream->readbuf.v =
perealloc(stream->readbuf.v, PS_ULEN(stream->readbuf_type == IS_UNICODE,
stream->readbuflen), stream->is_persistent);
}
- memcpy(stream->readbuf.s +
stream->writepos, bucket->buf.s, PS_ULEN(stream->readbuf_type == IS_UNICODE,
bucket->buflen));
+ memcpy(stream->readbuf.s +
PS_ULEN(stream->readbuf_type == IS_UNICODE, stream->writepos), bucket->buf.s,
PS_ULEN(stream->readbuf_type == IS_UNICODE, bucket->buflen));
stream->writepos +=
bucket->buflen;
php_stream_bucket_unlink(bucket
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
