diff options
| author | Zeev Suraski <zeev@php.net> | 2000-12-22 12:57:09 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-12-22 12:57:09 +0000 |
| commit | aa6d2ac5d0ee1d7cd608c6930ad0c57bc2953c47 (patch) | |
| tree | 5776ae30d4c8115659935309042b9784ba55d592 /sapi | |
| parent | 36eaad252fc5fe292cd4f071f76e7879ce21130c (diff) | |
| download | php-git-aa6d2ac5d0ee1d7cd608c6930ad0c57bc2953c47.tar.gz | |
Heads up people!
Updated the get_current_key() API - the relevant authors, please take
a look at the updated code and make sure it's ok...
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2filter/apache_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c index c15c2e2931..bf32040cd6 100644 --- a/sapi/apache2filter/apache_config.c +++ b/sapi/apache2filter/apache_config.c @@ -87,7 +87,7 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf) fprintf(stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf); for (zend_hash_internal_pointer_reset(&d->config); - zend_hash_get_current_key_ex(&d->config, &str, &str_len, &num_index, NULL) == HASH_KEY_IS_STRING; + zend_hash_get_current_key_ex(&d->config, &str, &str_len, &num_index, 0, NULL) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { pe = NULL; zend_hash_get_current_data(&d->config, (void **) &data); @@ -108,7 +108,7 @@ void apply_config(void *dummy) php_dir_entry *data; for (zend_hash_internal_pointer_reset(&d->config); - zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, NULL) == HASH_KEY_IS_STRING; + zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, 0, NULL) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { zend_hash_get_current_data(&d->config, (void **) &data); fprintf(stderr, "APPLYING (%s)(%s)\n", str, data->value); |