diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-02 07:50:19 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-02 07:50:19 +0000 |
| commit | 9c33e3d3ce6f537a039b33d638066245910b3282 (patch) | |
| tree | cffa1c30c12e623628692a95cd6d6c0485df6dae /ext/mbstring/php_mbregex.c | |
| parent | fff1d6a533cf6db280663552cfe8e18425467ef9 (diff) | |
| download | php-git-9c33e3d3ce6f537a039b33d638066245910b3282.tar.gz | |
MFH(r-1.46): fix php_regex_encoding() so it can handle two additional encoding
names mbfilter supports by default. (Patch by Seiji Masugata)
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |