mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
fixed #35711 ISO-8859 charset not correctly detected.
This commit is contained in:
parent
650bdb51fd
commit
3eab2fa294
@ -576,11 +576,26 @@ 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) {
|
||||
|
Loading…
Reference in New Issue
Block a user