cvs: php-src(PHP_5_0) / NEWS /sapi/apache mod_php5.c

dmitry Mon Aug 1 04:12:43 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/sapi/apache mod_php5.c Log: Fixed bug #33723 (php_value overrides php_admin_value) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.455&r2=1.1760.2.456&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.455 php-src/NEWS:1.1760.2.456 --- php-src/NEWS:1.1760.2.455 Mon Jul 25 17:07:19 2005 +++ php-src/NEWS Mon Aug 1 04:12:38 2005 @@ -19,6 +19,7 @@ - Fixed segfaults when CURL callback functions throw exception. (Tony) - Fixed bug #33853 (php:function call __autoload with lowercase param). (Marcus) - Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry) +- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry) - Fixed bug #33710 (ArrayAccess objects doen't initialize $this). (Dmitry) - Fixed bug #33588 (LDAP: RootDSE query not possible). (Jani) - Fixed bug #33558 (warning with nested calls to functions returning by http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.3&r2=1.10.2.4&ty=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.10.2.3 php-src/sapi/apache/mod_php5.c:1.10.2.4 --- php-src/sapi/apache/mod_php5.c:1.10.2.3 Tue Jun 28 12:38:03 2005 +++ php-src/sapi/apache/mod_php5.c Mon Aug 1 04:12:42 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.10.2.3 2005/06/28 16:38:03 bfrance Exp $ */ +/* $Id: mod_php5.c,v 1.10.2.4 2005/08/01 08:12:42 dmitry Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -694,11 +694,11 @@ /* {{{ should_overwrite_per_dir_entry */ -static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData) +static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_per_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData) { - php_per_dir_entry *new_per_dir_entry; + php_per_dir_entry *orig_per_dir_entry; - if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **) &new_per_dir_entry)==FAILURE) { + if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **) &orig_per_dir_entry)==FAILURE) { return 1; /* does not exist in dest, copy from source */ }