moriyoshi Thu Oct 2 03:49:15 2003 EDT Modified files: /php-src/ext/mbstring php_mbregex.c Log: Fix php_regex_encoding() so it can handle two additional encoding names mbfilter supports by default. Index: php-src/ext/mbstring/php_mbregex.c diff -u php-src/ext/mbstring/php_mbregex.c:1.45 php-src/ext/mbstring/php_mbregex.c:1.46 --- php-src/ext/mbstring/php_mbregex.c:1.45 Fri Sep 26 13:43:39 2003 +++ php-src/ext/mbstring/php_mbregex.c Thu Oct 2 03:49:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.c,v 1.45 2003/09/26 17:43:39 moriyoshi Exp $ */ +/* $Id: php_mbregex.c,v 1.46 2003/10/02 07:49:14 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -119,7 +119,8 @@ || 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 @@ } 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php