diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-02 07:49:14 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-02 07:49:14 +0000 |
| commit | f2b36ec52bf533eeb289d6039dcf7c40e2b735e3 (patch) | |
| tree | f7cb106240ee4edb28bc8a37f1e562459014d746 | |
| parent | 647408978e77c1d9bc0b8ea1f00a4973ea7d84ee (diff) | |
| download | php-git-f2b36ec52bf533eeb289d6039dcf7c40e2b735e3.tar.gz | |
Fix php_regex_encoding() so it can handle two additional encoding names
mbfilter supports by default.
| -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 f945d8c727..fa24a251f5 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -119,7 +119,8 @@ php_mb_reg_char_encoding 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 = REGCODE_EUCJP; } else if (strcasecmp("UTF-8", pname) == 0 || strcasecmp("UTF8", pname) == 0) { @@ -127,7 +128,8 @@ php_mb_reg_char_encoding 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 = REGCODE_SJIS; } else if (strcasecmp("ASCII", pname) == 0) { mbctype = REGCODE_ASCII; |