moriyoshi Thu Oct 2 03:50:20 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring php_mbregex.c
Log:
MFH(r-1.46): fix php_regex_encoding() so it can handle two additional encoding
names mbfilter supports by default. (Patch by Seiji Masugata)
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.18.2.10
php-src/ext/mbstring/php_mbregex.c:1.18.2.11
--- php-src/ext/mbstring/php_mbregex.c:1.18.2.10 Fri Sep 26 13:47:10 2003
+++ php-src/ext/mbstring/php_mbregex.c Thu Oct 2 03:50:19 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.18.2.10 2003/09/26 17:47:10 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.18.2.11 2003/10/02 07:50:19 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -94,7 +94,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 = MBCTYPE_EUC;
} else if (strcasecmp("UTF-8", pname) == 0
|| strcasecmp("UTF8", pname) == 0) {
@@ -102,7 +103,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 = MBCTYPE_SJIS;
} else if (strcasecmp("ASCII", pname) == 0) {
mbctype = MBCTYPE_ASCII;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
