diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-11-24 22:18:25 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-11-24 22:18:25 +0000 |
| commit | 40607b254a1bffb5c23058087ffa672391c40a98 (patch) | |
| tree | 3330bf1d10805e86022a634d7d0389aad66b8e47 /sapi/apache | |
| parent | 0d56cd2dfc8a5d35f3e863ab4b4464f45ff0a07a (diff) | |
| download | php-git-40607b254a1bffb5c23058087ffa672391c40a98.tar.gz | |
fix php_value application order for Apache
Diffstat (limited to 'sapi/apache')
| -rw-r--r-- | sapi/apache/mod_php5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 2763d75c0e..01eeeda3e7 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -729,11 +729,11 @@ static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_per_di return 1; /* does not exist in dest, copy from source */ } - if (new_per_dir_entry->type==PHP_INI_SYSTEM - && orig_per_dir_entry->type!=PHP_INI_SYSTEM) { - return 1; - } else { + if (orig_per_dir_entry->type==PHP_INI_SYSTEM + && new_per_dir_entry->type!=PHP_INI_SYSTEM) { return 0; + } else { + return 1; } } /* }}} */ @@ -770,9 +770,9 @@ static void *php_merge_dir(pool *p, void *basev, void *addv) /* need a copy of addv to merge */ new = php_create_dir(p, "php_merge_dir"); - zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t) copy_per_dir_entry, NULL, sizeof(php_per_dir_entry)); + zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, NULL, sizeof(php_per_dir_entry)); - zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL); + zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL); return new; } /* }}} */ |