From: Zeev Suraski <zeev@php.net>
Date: Sat, 5 Jun 1999 17:47:16 +0000 (+0000)
Subject: I got the order wrong earlier :I
X-Git-Tag: BEFORE_REMOVING_GC_STEP1~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e49aafcf5798e2017e6f528e738ef4b4b3ccacf6;p=php

I got the order wrong earlier :I
---

diff --git a/mod_php4.c b/mod_php4.c
index a6aab9e16a..3a96cc80c1 100644
--- 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;
 }