I got the order wrong earlier :I

diff --git a/mod_php4.c b/mod_php4.c
index a6aab9e16a8bd3963631887ca942b0109232d4f0..3a96cc80c17264092e2924e8125526d25626d6b3 100644 (file)
--- a/mod_php4.c
+++ b/mod_php4.c
@@ -379,8 +379,8 @@ static void *php_merge_dir(pool *p, void *basev, void *addv)
 {
        php_per_dir_entry tmp;
 
-       zend_hash_merge((HashTable *) basev, (HashTable *) addv, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 1);
-       return basev;
+       zend_hash_merge((HashTable *) addv, (HashTable *) basev, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 0);
+       return addv;
 }