diff options
| author | Sara Golemon <pollita@php.net> | 2014-01-30 02:05:49 -0800 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-01-30 02:05:49 -0800 |
| commit | 45e2a557f151a75ae4e56ed8625744e1040b493a (patch) | |
| tree | 335b49d7f0b2d891711b18d88271df6703bc5b67 | |
| parent | 2cbd8572835a07ca2a1f3a2a302e78c7ce998e9a (diff) | |
| parent | 179e45920cbedc3bee1a8c46457cb42b2926e5e4 (diff) | |
| download | php-git-45e2a557f151a75ae4e56ed8625744e1040b493a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Make html_table_gen consistent with html_table.h
| -rw-r--r-- | ext/standard/html_tables/html_table_gen.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 7e7314fa35..68dec133f5 100644 --- 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 }, |