diff options
| author | Nikita Popov <nikic@php.net> | 2014-12-23 22:00:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-12-26 21:06:18 +0100 |
| commit | 2d212b426a22c9d9f357be0a6832ced9a3fff073 (patch) | |
| tree | f1d0ec807cca7add558b6282b85e136e2e5a9bfd /sapi/apache2handler | |
| parent | 3d12fc796b0048ab498f82ac497476129a7976e7 (diff) | |
| download | php-git-2d212b426a22c9d9f357be0a6832ced9a3fff073.tar.gz | |
Drop duplicate arg from hash_get_current_key_ex
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 9eed8dba0f..92a683b22c 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -157,8 +157,8 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf) //??? zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL); #if STAS_0 for (zend_hash_internal_pointer_reset(&d->config); - zend_hash_get_current_key_ex(&d->config, &str, &str_len, - &num_index, 0, NULL) == HASH_KEY_IS_STRING; + zend_hash_get_current_key(&d->config, &str, &str_len, + &num_index) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { pe = NULL; zend_hash_get_current_data(&d->config, (void **) &data); |