From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 28 Apr 2015 23:29:04 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2ef8a9acc7977d07a9a92b07352cdefa7c4b9a5;p=php

Merge branch 'PHP-5.6'
---

c2ef8a9acc7977d07a9a92b07352cdefa7c4b9a5
diff --cc ext/date/php_date.c
index f00ce047b4,9d3b53c12a..4ca8d19e24
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -3833,24 -3907,26 +3833,24 @@@ PHP_FUNCTION(timezone_transitions_get
  	}
  
  #define add_nominal() \
 -		MAKE_STD_ZVAL(element); \
 -		array_init(element); \
 -		add_assoc_long(element, "ts",     timestamp_begin); \
 -		add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0); \
 -		add_assoc_long(element, "offset", tzobj->tzi.tz->type[0].offset); \
 -		add_assoc_bool(element, "isdst",  tzobj->tzi.tz->type[0].isdst); \
 -		add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx], 1); \
 -		add_next_index_zval(return_value, element);
 +		array_init(&element); \
 +		add_assoc_long(&element, "ts",     timestamp_begin); \
 +		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0)); \
 +		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[0].offset); \
 +		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[0].isdst); \
 +		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx]); \
 +		add_next_index_zval(return_value, &element);
  
  #define add(i,ts) \
 -		MAKE_STD_ZVAL(element); \
 -		array_init(element); \
 -		add_assoc_long(element, "ts",     ts); \
 -		add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0 TSRMLS_CC), 0); \
 -		add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \
 -		add_assoc_bool(element, "isdst",  tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \
 -		add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx], 1); \
 -		add_next_index_zval(return_value, element);
 +		array_init(&element); \
 +		add_assoc_long(&element, "ts",     ts); \
 +		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0)); \
 +		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \
 +		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \
 +		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \
 +		add_next_index_zval(return_value, &element);
  
- #define add_last() add(tzobj->tzi.tz->timecnt - 1, timestamp_begin)
+ #define add_last() add(tzobj->tzi.tz->bit32.timecnt - 1, timestamp_begin)
  
  	array_init(return_value);