moriyoshi Fri Feb 6 07:32:44 2009 UTC
Added files:
/php-src/ext/mbstring/tests bug45239.phpt
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- Fix bug #45239 (encoding detector hangs with mbstring.strict_detection
enabled).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.15
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.16
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.15 Fri Aug 1 22:55:47 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c Fri Feb 6 07:32:44 2009
@@ -462,10 +462,9 @@
while (n >= 0) {
filter = identd->filter_list[n];
if (!filter->flag) {
- if (identd->strict && filter->status) {
- continue;
+ if (!identd->strict || !filter->status) {
+ encoding =
filter->encoding->no_encoding;
}
- encoding = filter->encoding->no_encoding;
}
n--;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug45239.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/bug45239.phpt
+++ php-src/ext/mbstring/tests/bug45239.phpt
--TEST--
Bug #45239 (encoding detector hangs with mbstring.strict_detection enabled)
--INI--
mbstring.strict_detection=1
mbstring.http_input=UTF-8
mbstring.internal_encoding=UTF-8
--SKIPIF--
<?php
extension_loaded('mbstring') or die('skip');
?>
--FILE--
<?php
mb_internal_encoding("utf-8");
mb_parse_str("a=%fc", $dummy);
var_dump(mb_http_input());
?>
--EXPECT--
string(5) "UTF-8"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
