diff options
| author | Zeev Suraski <zeev@php.net> | 1999-06-05 17:47:16 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-06-05 17:47:16 +0000 |
| commit | e49aafcf5798e2017e6f528e738ef4b4b3ccacf6 (patch) | |
| tree | 851c07df8e6053906cac95d01500868eb0c8fdc5 /mod_php4.c | |
| parent | e586468a4e8e4906392dd99a302c39f623212321 (diff) | |
| download | php-git-e49aafcf5798e2017e6f528e738ef4b4b3ccacf6.tar.gz | |
I got the order wrong earlier :I
Diffstat (limited to 'mod_php4.c')
| -rw-r--r-- | mod_php4.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |