hirokawa Sat Dec 24 01:20:26 2005 EDT
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
fixed #35711 ISO-8859 charset not correctly detected.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.8
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.9
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.8 Sat Nov 5 04:47:29 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c Sat Dec 24 01:20:26 2005
@@ -576,11 +576,26 @@
for (i = 0; i < num; i++) {
filter = &flist[i];
if (!filter->flag) {
+ if (strict && filter->status) {
+ continue;
+ }
encoding = filter->encoding;
break;
}
}
+ /* fall-back judge */
+ if (!encoding) {
+ for (i = 0; i < num; i++) {
+ filter = &flist[i];
+ if (!filter->flag) {
+ encoding = filter->encoding;
+ break;
+ }
+ }
+ }
+
+
/* cleanup */
/* dtors should be called in reverse order */
i = num; while (--i >= 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
