diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-08-01 08:12:42 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-08-01 08:12:42 +0000 |
| commit | 03913f1308dbbcfa24f4f6ea9f62957b4ef76fcc (patch) | |
| tree | 2fa51dfcd89632f2ee437a8820e9d019d8289e8c | |
| parent | c82f578f82882ffe8694b0846ee8632a15949d60 (diff) | |
| download | php-git-03913f1308dbbcfa24f4f6ea9f62957b4ef76fcc.tar.gz | |
Fixed bug #33723 (php_value overrides php_admin_value)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/apache/mod_php5.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -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 d7672fd338..bef6ea8fb6 100644 --- 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 */ } |