diff options
| author | Anatol Belski <ab@php.net> | 2014-10-17 10:13:08 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-17 10:13:08 +0200 |
| commit | 2942a4aa451452c354b2eb2e14f583978388a61a (patch) | |
| tree | 4afe9f92c6e54a0349417cf6dce9171d9a8535d5 /ext/standard/array.c | |
| parent | aac7b1db7c9df59ffb0860de7692c653719cf4d0 (diff) | |
| parent | 1f6bd981433cdfc90238a95aa7339d72e7f2bc01 (diff) | |
| download | php-git-2942a4aa451452c354b2eb2e14f583978388a61a.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
Micro optimizations for isset/empty
Micro optimization for zend_hash_next_index_insert_new()
Fix array_keys() on $GLOBALS
Fix procedural finfo calls in methods
Conflicts:
ext/mysqlnd/config.w32
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 7b49b2fd13..7d8e4d0efe 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2597,7 +2597,7 @@ PHP_FUNCTION(array_keys) add_key = 1; /* Go through input array and add keys to the return array */ - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(input), num_idx, str_idx, entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(input), num_idx, str_idx, entry) { if (search_value != NULL) { is_equal_func(&res, search_value, entry TSRMLS_CC); add_key = zval_is_true(&res); |