From: Xinchen Hui <laruence@php.net>
Date: Fri, 27 Feb 2015 03:13:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b8a504519ddf6fb2fb050070ff823f07fb7a406;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/date/php_date.c
---

5b8a504519ddf6fb2fb050070ff823f07fb7a406
diff --cc ext/date/php_date.c
index 4b6deaf648,a3f8735433..fbc4f85205
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -3660,17 -3735,14 +3660,20 @@@ PHP_METHOD(DateTimeZone, __construct
  }
  /* }}} */
  
 -static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht TSRMLS_DC)
 +static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht) /* {{{ */
  {
 -	zval            **z_timezone = NULL;
 -	zval            **z_timezone_type = NULL;
 +	zval            *z_timezone;
 +	zval            *z_timezone_type;
  
- 	if ((z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1)) != NULL) {
- 		if ((z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1)) != NULL) {
- 			if(Z_TYPE_P(z_timezone_type) != IS_LONG) {
 -	if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) {
 -		if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) {
 -			if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_PP(z_timezone) TSRMLS_CC)) {
++	if ((z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type") - 1)) != NULL) {
++		if ((z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone") - 1)) != NULL) {
++			if (Z_TYPE_P(z_timezone_type) != IS_LONG) {
++				return FAILURE;
++			}
++			if (Z_TYPE_P(z_timezone) != IS_STRING) {
 +				return FAILURE;
 +			}
 +			if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_P(z_timezone))) {
  				return SUCCESS;
  			}
  		}