cvs: php-src /sapi/apache mod_php.c

scottmac Mon Jun 18 15:57:00 2007 UTC Modified files: /php-src/sapi/apache mod_php.c Log: MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3). http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/apache/mod_php.c diff -u php-src/sapi/apache/mod_php.c:1.2 php-src/sapi/apache/mod_php.c:1.3 --- php-src/sapi/apache/mod_php.c:1.2 Thu Jan 11 23:18:11 2007 +++ php-src/sapi/apache/mod_php.c Mon Jun 18 15:57:00 2007 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php.c,v 1.2 2007/01/11 23:18:11 andrei Exp $ */ +/* $Id: mod_php.c,v 1.3 2007/06/18 15:57:00 scottmac Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -749,9 +749,15 @@ */ 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; } /* }}} */