stas Tue Nov 25 00:33:11 2008 UTC Modified files: /php-src/sapi/apache mod_php.c /php-src/sapi/apache2handler apache_config.c Log: MFB: fix php_value application order for Apache http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.10&r2=1.11&diff_format=u Index: php-src/sapi/apache/mod_php.c diff -u php-src/sapi/apache/mod_php.c:1.10 php-src/sapi/apache/mod_php.c:1.11 --- php-src/sapi/apache/mod_php.c:1.10 Thu Nov 13 10:33:08 2008 +++ php-src/sapi/apache/mod_php.c Tue Nov 25 00:33:10 2008 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php.c,v 1.10 2008/11/13 10:33:08 lbarnaud Exp $ */ +/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -738,11 +738,11 @@ 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; } } /* }}} */ @@ -779,9 +779,9 @@ /* 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; } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.15&r2=1.16&diff_format=u Index: php-src/sapi/apache2handler/apache_config.c diff -u php-src/sapi/apache2handler/apache_config.c:1.15 php-src/sapi/apache2handler/apache_config.c:1.16 --- php-src/sapi/apache2handler/apache_config.c:1.15 Mon Dec 31 07:12:19 2007 +++ php-src/sapi/apache2handler/apache_config.c Tue Nov 25 00:33:11 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c,v 1.15 2007/12/31 07:12:19 sebastian Exp $ */ +/* $Id: apache_config.c,v 1.16 2008/11/25 00:33:11 stas Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -117,6 +117,23 @@ return NULL; } +static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData) +{ + php_dir_entry *orig_per_dir_entry; + + if (zend_hash_find(target_ht, hash_key->arKey.s, hash_key->nKeyLength, (void **) &orig_per_dir_entry)==FAILURE) { + return 1; /* does not exist in dest, copy from source */ + } + + if (new_per_dir_entry->status >= orig_per_dir_entry->status) { + /* use new entry */ + phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", hash_key->arKey.s, new_per_dir_entry->status, orig_per_dir_entry->status)); + return 1; + } else { + return 0; + } +} + void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf) { @@ -128,9 +145,12 @@ ulong num_index; n = create_php_config(p, "merge_php_config"); - zend_hash_copy(&n->config, &e->config, NULL, NULL, sizeof(php_dir_entry)); - + /* copy old config */ + zend_hash_copy(&n->config, &d->config, NULL, NULL, sizeof(php_dir_entry)); + /* merge new config */ phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf, n)); + zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL); +#if STAS_0 for (zend_hash_internal_pointer_reset(&d->config); zend_hash_get_current_key_ex(&d->config, &str, &str_len, &num_index, 0, NULL) == HASH_KEY_IS_STRING; @@ -143,7 +163,7 @@ zend_hash_update(&n->config, str.s, str_len, data, sizeof(*data), NULL); phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", str.s, data->status, pe?pe->status:-1)); } - +#endif return n; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php