Fixed bug #33723 (php_value overrides php_admin_value)

diff --git a/NEWS b/NEWS
index e42fe7d98a5bed06e23b5bf735a9525ad2ef9867..c9d46c50794fc389bbca3b05ce9c5c841fa18b87 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ PHP                                                                        NEWS
 - 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

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index d7672fd3387f341e0467d42e128f52caf2efb31f..bef6ea8fb6364849d6666163fe8fa2fc59cb0d3c 100644 (file)
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -694,11 +694,11 @@ static void copy_per_dir_entry(php_per_dir_entry *per_dir_entry)
 
 /* {{{ 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 */
        }