From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Wed, 18 Mar 2009 17:03:38 +0000 (+0000)
Subject: - Add entries for the encodings that are already supported by mbstring but
X-Git-Tag: php-5.3.0RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9a9e75b0bdca8c425f09f37c4c688488d7cd066;p=php

- Add entries for the encodings that are already supported by mbstring but
  not listed here.
---

diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c
index 812417bef3..730348b8a7 100644
--- a/Zend/zend_multibyte.c
+++ b/Zend/zend_multibyte.c
@@ -426,6 +426,33 @@ static zend_encoding encoding_koi8r = {
 	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 @@ static zend_encoding *zend_encoding_table[] = {
 	&encoding_cp1251,
 	&encoding_cp866,
 	&encoding_koi8r,
+	&encoding_koi8u,
+	&encoding_armscii8,
+	&encoding_cp1254,
 	NULL
 };