MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).

diff --git a/sapi/apache/mod_php.c b/sapi/apache/mod_php.c
index 921f44984f07b2043dea6766bc9125a6ea1ba2b9..b0b2108eac92d535bfb8f73d3318c91ba97b097d 100644 (file)
--- a/sapi/apache/mod_php.c
+++ b/sapi/apache/mod_php.c
@@ -749,9 +749,15 @@ static void *php_create_dir(pool *p, char *dummy)
  */
 static void *php_merge_dir(pool *p, void *basev, void *addv)
 {
-       /* This function *must* return addv, and not modify basev */
-       zend_hash_merge_ex((HashTable *) addv, (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);
-       return addv;
+       /* This function *must* not modify addv or basev */
+       HashTable *new;
+
+       /* 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_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);
+       return new;
 }
 /* }}} */