From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 24 Dec 2005 04:32:42 +0000 (+0000)
Subject: MFH: fixed #35711 ISO-8859 charset not correctly detected.
X-Git-Tag: php-5.1.2RC2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11105b1eed25ecf9e2c5260a631cfc7a962ce773;p=php

MFH: fixed #35711 ISO-8859 charset not correctly detected.
---

diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c
index 0e7072fda7..e543951d33 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfilter.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c
@@ -576,11 +576,25 @@ mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int el
 	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) {