Commit: b7788c52f1e30e425795870e0a1450a620a41f08 Author: Nikita Popov <ni...@php.net> Fri, 15 Mar 2013 13:48:33 +0100 Parents: cc51729c00aedeb69771ebface605e121ca1d15a Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7788c52f1e30e425795870e0a1450a620a41f08 Log: Fix wrong macro usage and add missing NEWS entry Changed paths: M NEWS M Zend/zend_API.c Diff: diff --git a/NEWS b/NEWS index 9d87b95..1693268 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,8 @@ PHP NEWS details here: https://wiki.php.net/rfc/cli_process_title. (Keyur) . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). (Anatol) + . Added support for non-scalar Iterator keys in foreach + (https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov) - mysqlnd . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 2653d08..8c3a357 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1521,7 +1521,7 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */ result = zend_hash_index_update(ht, Z_LVAL_P(key), &value, sizeof(zval *), NULL); break; case IS_DOUBLE: - result = zend_hash_index_update(ht, zend_dval_to_lval(Z_LVAL_P(key)), &value, sizeof(zval *), NULL); + result = zend_hash_index_update(ht, zend_dval_to_lval(Z_DVAL_P(key)), &value, sizeof(zval *), NULL); break; default: zend_error(E_WARNING, "Illegal offset type"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
