diff options
| author | Michael Wallner <mike@php.net> | 2006-06-09 16:29:55 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2006-06-09 16:29:55 +0000 |
| commit | 90862d7e7f6ba481977a5bf6e71108219529b74f (patch) | |
| tree | 9c3cf0691d0dd46e3270dd54e43e654146099e61 | |
| parent | 39601bb33b18abc9007c589976202cf90462250f (diff) | |
| download | php-git-90862d7e7f6ba481977a5bf6e71108219529b74f.tar.gz | |
- sync with apache2handler
| -rw-r--r-- | sapi/apache2filter/apache_config.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c index 8ef6c9c505..bca8057cb1 100644 --- a/sapi/apache2filter/apache_config.c +++ b/sapi/apache2filter/apache_config.c @@ -126,28 +126,31 @@ static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf) { - php_conf_rec *d = base_conf, *e = new_conf; + php_conf_rec *d = base_conf, *e = new_conf, *n = NULL; php_dir_entry *pe; php_dir_entry *data; char *str; uint str_len; ulong num_index; - phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf)); + n = create_php_config(p, "merge_php_config"); + zend_hash_copy(&n->config, &e->config, NULL, NULL, sizeof(php_dir_entry)); + + phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf, n)); 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_move_forward(&d->config)) { pe = NULL; zend_hash_get_current_data(&d->config, (void **) &data); - if (zend_hash_find(&e->config, str, str_len, (void **) &pe) == SUCCESS) { + if (zend_hash_find(&n->config, str, str_len, (void **) &pe) == SUCCESS) { if (pe->status >= data->status) continue; } - zend_hash_update(&e->config, str, str_len, data, sizeof(*data), NULL); - phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", str, - data->status, pe?pe->status:-1)); + zend_hash_update(&n->config, str, str_len, data, sizeof(*data), NULL); + phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", str, data->status, pe?pe->status:-1)); } - return new_conf; + + return n; } char *get_php_config(void *conf, char *name, size_t name_len) |