- sync with apache2handler

diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c
index a77a6b57143d3d5d307957b0ef6c472ff34369e8..46d286e1df13c3fe249e68fcc3cb5b7f8b54929c 100644 (file)
--- a/sapi/apache2filter/apache_config.c
+++ b/sapi/apache2filter/apache_config.c
@@ -128,28 +128,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)