Merge branch 'PHP-5.5' into PHP-5.6

nikic · Feb 11, 2014 · 75f59e1 · 75f59e1
2 parents 9fa6bcd + 39e721c
commit 75f59e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -3638,7 +3638,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML
 		efree(dummy_t);
 		return FAILURE;
 	} else {
-		set_timezone_from_timelib_time(tzobj, dummy_t TSRMLS_CC);
+		set_timezone_from_timelib_time(tzobj, dummy_t);
 		efree(dummy_t);
 		return SUCCESS;
 	}

diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php
@@ -80,8 +80,11 @@ enum entity_charset charset;
 	{ "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 },