From 179e45920cbedc3bee1a8c46457cb42b2926e5e4 Mon Sep 17 00:00:00 2001 From: Dmitry Panin Date: Mon, 3 Feb 2014 09:49:54 -0800 Subject: [PATCH 1/2] Make html_table_gen consistent with html_table.h In commit 6dabd7de04ae3ed the html_table.h was changed manually, without changing the underlying generator (html_table_gen.php). This commit fixes it. --- ext/standard/html_tables/html_table_gen.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 7e7314fa3564f..68dec133f58af 100644 --- 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 }, From 39e721cf50276e5872e445b36fefdc4eb80cdcf7 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 11 Feb 2014 11:27:01 +0000 Subject: [PATCH 2/2] Fixed ZTS and added fix to NEWS. --- NEWS | 4 ++++ ext/date/php_date.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 04bb71c4fd3ce..c657efc94371a 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,10 @@ PHP NEWS - Core: . Fixed Request #66574i (Allow multiple paths in php_ini_scanned_path). (Remi) +- Date: + . Fixed bug #45528 (Allow the DateTimeZone constructor to accept timezones + per offset too). (Derick) + - LDAP: . Implemented ldap_modify_batch (https://wiki.php.net/rfc/ldap_modify_batch). (Ondřej Hošek) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a61d9db3c1992..f6b12bc42ed9b 100644 --- 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; }