From: Moriyoshi Koizumi Date: Thu, 2 Oct 2003 07:50:19 +0000 (+0000) Subject: MFH(r-1.46): fix php_regex_encoding() so it can handle two additional encoding X-Git-Tag: php-4.3.4RC2~79 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c33e3d3ce6f537a039b33d638066245910b3282;p=php MFH(r-1.46): fix php_regex_encoding() so it can handle two additional encoding names mbfilter supports by default. (Patch by Seiji Masugata) --- diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 0869f51c40..bae7142a96 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -94,7 +94,8 @@ static int _php_mb_regex_name2mbctype(const char *pname) || strcasecmp("X-EUC-JP", pname) == 0 || strcasecmp("UJIS", pname) == 0 || strcasecmp("EUCJP", pname) == 0 - || strcasecmp("EUC_JP", pname) == 0) { + || strcasecmp("EUC_JP", pname) == 0 + || strcasecmp("EUCJP-WIN", pname) == 0) { mbctype = MBCTYPE_EUC; } else if (strcasecmp("UTF-8", pname) == 0 || strcasecmp("UTF8", pname) == 0) { @@ -102,7 +103,8 @@ static int _php_mb_regex_name2mbctype(const char *pname) } else if (strcasecmp("SJIS", pname) == 0 || strcasecmp("CP932", pname) == 0 || strcasecmp("MS932", pname) == 0 - || strcasecmp("SHIFT_JIS", pname) == 0 ) { + || strcasecmp("SHIFT_JIS", pname) == 0 + || strcasecmp("SJIS-WIN", pname) == 0) { mbctype = MBCTYPE_SJIS; } else if (strcasecmp("ASCII", pname) == 0) { mbctype = MBCTYPE_ASCII;