cvs: ZendEngine2(PHP_5_3) / zend_multibyte.c

moriyoshi		Wed Mar 18 17:03:38 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_multibyte.c 
  Log:
  - Add entries for the encodings that are already supported by mbstring but
    not listed here.
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_multibyte.c?r1=1.4.2.4.2.1.2.4&r2=1.4.2.4.2.1.2.5&diff_format=u
Index: ZendEngine2/zend_multibyte.c
diff -u ZendEngine2/zend_multibyte.c:1.4.2.4.2.1.2.4 ZendEngine2/zend_multibyte.c:1.4.2.4.2.1.2.5
--- ZendEngine2/zend_multibyte.c:1.4.2.4.2.1.2.4	Wed Mar 18 16:51:15 2009
+++ ZendEngine2/zend_multibyte.c	Wed Mar 18 17:03:38 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_multibyte.c,v 1.4.2.4.2.1.2.4 2009/03/18 16:51:15 moriyoshi Exp $ */
+/* $Id: zend_multibyte.c,v 1.4.2.4.2.1.2.5 2009/03/18 17:03:38 moriyoshi Exp $ */
 
 #include "zend.h"
 #include "zend_compile.h"
@@ -426,6 +426,33 @@
 	1
 };
 
+static const char *koi8u_aliases[] = {"KOI8-U", "KOI8U", NULL};
+static zend_encoding encoding_koi8u = {
+	NULL,
+	NULL,
+	"KOI8-U",
+	(const char *(*)[])&koi8u_aliases,
+	1
+};
+
+static const char *cp1254_aliases[] = {"cp1254", NULL};
+static zend_encoding encoding_cp1254 = {
+	NULL,
+	NULL,
+	"Windows-1254",
+	(const char *(*)[])&cp1254_aliases,
+	1
+};
+
+static const char *armscii8_aliases[] = {"ArmSCII-8", "ArmSCII8", "ARMSCII-8", "ARMSCII8", NULL};
+static zend_encoding encoding_armscii8 = {
+	NULL,
+	NULL,
+	"ArmSCII-81254",
+	(const char *(*)[])&armscii8_aliases,
+	1
+};
+
 static zend_encoding *zend_encoding_table[] = {
 	&encoding_ucs4,
 	&encoding_ucs4be,
@@ -471,6 +498,9 @@
 	&encoding_cp1251,
 	&encoding_cp866,
 	&encoding_koi8r,
+	&encoding_koi8u,
+	&encoding_armscii8,
+	&encoding_cp1254,
 	NULL
 };