MFB: fix php_value application order for Apache

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 3acf8a58f55a5415e6565bfe273cb135428253b2..bc65f6be57b9c8a2af033cf1580ecf0faf8b64f4 100644 (file)
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -745,11 +745,11 @@ static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_per_di
                return 1; /* does not exist in dest, copy from source */
        }
 
-       if (new_per_dir_entry->type==PHP_INI_SYSTEM
-               && orig_per_dir_entry->type!=PHP_INI_SYSTEM) {
-               return 1;
-       } else {
+       if (orig_per_dir_entry->type==PHP_INI_SYSTEM
+               && new_per_dir_entry->type!=PHP_INI_SYSTEM) {
                return 0;
+       } else {
+               return 1;
        }
 }
 /* }}} */
@@ -786,9 +786,9 @@ static void *php_merge_dir(pool *p, void *basev, void *addv)
 
        /* need a copy of addv to merge */
        new = php_create_dir(p, "php_merge_dir");
-       zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t) copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+       zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
 
-       zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+       zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
        return new;
 }
 /* }}} */

diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index c629dbf48edb28630036b212b0ef5c273b90b151..b53a0c984d425867d4a91ddff4a393a24c38e1b6 100644 (file)
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -117,6 +117,23 @@ static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const ch
        return NULL;
 }
 
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
+{
+       php_dir_entry *orig_per_dir_entry;
+
+       if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **) &orig_per_dir_entry)==FAILURE) {
+               return 1; /* does not exist in dest, copy from source */
+       }
+
+       if (new_per_dir_entry->status >= orig_per_dir_entry->status) {
+               /* use new entry */
+               phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", hash_key->arKey, new_per_dir_entry->status, orig_per_dir_entry->status));
+               return 1;
+       } else {
+               return 0;
+       }
+}
+
 
 void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
 {
@@ -128,9 +145,12 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
        ulong num_index;
 
        n = create_php_config(p, "merge_php_config");
-       zend_hash_copy(&n->config, &e->config, NULL, NULL, sizeof(php_dir_entry));
-
+       /* copy old config */
+       zend_hash_copy(&n->config, &d->config, NULL, NULL, sizeof(php_dir_entry));
+       /* merge new config */
        phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf, n));
+       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;
@@ -140,10 +160,10 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
                if (zend_hash_find(&n->config, str, str_len, (void **) &pe) == SUCCESS) {
                        if (pe->status >= data->status) continue;
                }
-               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));
+               zend_hash_update(&n->config, str, str_len, data, sizeof(*data), NULL);
        }
-
+#endif
        return n;
 }