diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-08-01 07:46:54 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-08-01 07:46:54 +0000 |
| commit | cf6bb997237629d74389204642547e0c1d4484e8 (patch) | |
| tree | bda722142def4a86c8d8128a3b7247ff14363965 /sapi | |
| parent | a5efa0d4c3d84df6a03d6933ade1a99943c171f4 (diff) | |
| download | php-git-cf6bb997237629d74389204642547e0c1d4484e8.tar.gz | |
Fixed bug #33723 (php_value overrides php_admin_value)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php5.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 */ } |