Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: Make html_table_gen consistent with html_table.h
13 years ago · 45e2a557f1
1 changed files with 3 additions and 0 deletions
--- a/ext/standard/html_tables/html_table_gen.php
+++ b/ext/standard/html_tables/html_table_gen.php
@ -80,8 +80,11 @@ static const struct {
 	{ "Shift_JIS",		cs_sjis },
 	{ "SJIS",			cs_sjis },
 	{ "932",			cs_sjis },
+	{ "SJIS-win",		cs_sjis },
+	{ "CP932",			cs_sjis },
 	{ "EUCJP",			cs_eucjp },
 	{ "EUC-JP",			cs_eucjp },
+	{ "eucJP-win",		cs_eucjp },
 	{ "KOI8-R",			cs_koi8r },
 	{ "koi8-ru",		cs_koi8r },
 	{ "koi8r",			cs_koi8r },