diff options
| author | Sara Golemon <pollita@php.net> | 2014-01-30 02:06:30 -0800 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-01-30 02:06:30 -0800 |
| commit | 7f42e62d22776669523dc9c896ba738999beb346 (patch) | |
| tree | ac201ba747c5fca05db9fd2d462b4a03057818ea | |
| parent | 66500333cffca7134141b9f65b4d8719abbf6e61 (diff) | |
| parent | 45e2a557f151a75ae4e56ed8625744e1040b493a (diff) | |
| download | php-git-7f42e62d22776669523dc9c896ba738999beb346.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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 }, |