hirokawa Sat Dec 24 04:32:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
MFH: fixed #35711 ISO-8859 charset not correctly detected.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7.2.1&r2=1.7.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.1 Sat Nov 5
04:49:57 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c Sat Dec 24 04:32:42 2005
@@ -576,11 +576,25 @@
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
