CVS update: php4

From: Date: Sat, 05 Jun 1999 17:47:16 +0000
Subject: CVS update: php4
Groups: php.version4 
Request: Send a blank email to php-version4+get-1295@lists.php.net to get a copy of this message
Date: Saturday June 5, 1999 @ 13:47 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv8066 Modified Files: mod_php4.c Log Message: I got the order wrong earlier :I Index: php4/mod_php4.c diff -u php4/mod_php4.c:1.6 php4/mod_php4.c:1.7 --- php4/mod_php4.c:1.6 Sat May 29 15:06:22 1999 +++ php4/mod_php4.c Sat Jun 5 13:47:16 1999 @@ -28,7 +28,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.6 1999/05/29 19:06:22 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.7 1999/06/05 17:47:16 zeev Exp $ */ #include "httpd.h" #include "http_config.h" @@ -379,8 +379,8 @@ { 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; }

« previous php.version4 (#1295) next »