diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-07 23:14:17 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-07 23:14:17 +0400 |
| commit | 3d17219cd88a73306acd6eeff8cbae02868318c6 (patch) | |
| tree | 0fc6fbd9f710573bae5e55ce0d29caf327bfcbb6 /main/php_ini.c | |
| parent | 3167b49ce9533a344cb2f16fa5c815f9f81bb434 (diff) | |
| download | php-git-3d17219cd88a73306acd6eeff8cbae02868318c6.tar.gz | |
Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer.
&(ht)->nInternalPointer should be passed instead of NULL.
zend_hash_update_current_key() may work only with internal pointer.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index a1b2cecabc..024dbe6821 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -765,7 +765,7 @@ PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int /* Walk through config hash and alter matching ini entries using the values found in the hash */ for (zend_hash_internal_pointer_reset(source_hash); - zend_hash_get_current_key_ex(source_hash, &str, &num_index, 0, NULL) == HASH_KEY_IS_STRING; + zend_hash_get_current_key(source_hash, &str, &num_index, 0) == HASH_KEY_IS_STRING; zend_hash_move_forward(source_hash) ) { data = zend_hash_get_current_data(source_hash); |