From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 1 Aug 2005 07:46:54 +0000 (+0000)
Subject: Fixed bug #33723 (php_value overrides php_admin_value)
X-Git-Tag: RELEASE_2_0_0~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf6bb997237629d74389204642547e0c1d4484e8;p=php

Fixed bug #33723 (php_value overrides php_admin_value)
---

diff --git a/NEWS b/NEWS
index 623faa96e5..d80890adfd 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
 - Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
   on execution of prepared statments). (Ilia)
 - 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 #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
 - Fixed bug #33578 (strtotime() problem with "Oct17" format). (Derick)
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 0d4a3f4662..650542d3db 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -707,11 +707,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 */
 	}