pollita Fri Jul 14 19:15:31 2006 UTC
Modified files:
/php-src/main/streams unicode_filter.c
Log:
#38105 (2/3) Filters should report char/UChar count, not bytes
http://cvs.php.net/viewvc.cgi/php-src/main/streams/unicode_filter.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/main/streams/unicode_filter.c
diff -u php-src/main/streams/unicode_filter.c:1.1
php-src/main/streams/unicode_filter.c:1.2
--- php-src/main/streams/unicode_filter.c:1.1 Wed Mar 29 01:20:43 2006
+++ php-src/main/streams/unicode_filter.c Fri Jul 14 19:15:31 2006
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode_filter.c,v 1.1 2006/03/29 01:20:43 pollita Exp $ */
+/* $Id: unicode_filter.c,v 1.2 2006/07/14 19:15:31 pollita Exp $ */
#include "php.h"
@@ -79,7 +79,7 @@
php_stream_bucket_append(buckets_out, new_bucket
TSRMLS_CC);
exit_status = PSFS_PASS_ON;
}
- consumed += UBYTES(bucket->buflen);
+ consumed += bucket->buflen;
php_stream_bucket_delref(bucket TSRMLS_CC);
}
@@ -131,7 +131,7 @@
php_stream_bucket_unlink(bucket TSRMLS_CC);
if (bucket->buf_type == IS_UNICODE) {
/* already in unicode, nothing to do */
- consumed += UBYTES(bucket->buflen);
+ consumed += bucket->buflen;
php_stream_bucket_append(buckets_out, bucket TSRMLS_CC);
exit_status = PSFS_PASS_ON;
continue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
