stas Mon Nov 24 22:23:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache mod_php5.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_php5.c?r1=1.19.2.7.2.13.2.8&r2=1.19.2.7.2.13.2.9&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.8
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.9
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.8 Thu Nov 13 10:14:04 2008
+++ php-src/sapi/apache/mod_php5.c Mon Nov 24 22:23:11 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.8 2008/11/13 10:14:04 lbarnaud Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.9 2008/11/24 22:23:11 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -745,11 +745,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;
}
}
/* }}} */
@@ -786,9 +786,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.7.2.1.2.4.2.1&r2=1.7.2.1.2.4.2.2&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.1
php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.2
--- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.1 Mon Dec 31
07:17:18 2007
+++ php-src/sapi/apache2handler/apache_config.c Mon Nov 24 22:23:11 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: apache_config.c,v 1.7.2.1.2.4.2.1 2007/12/31 07:17:18 sebastian Exp $
*/
+/* $Id: apache_config.c,v 1.7.2.1.2.4.2.2 2008/11/24 22:23: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, 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, 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;
@@ -140,10 +160,10 @@
if (zend_hash_find(&n->config, str, str_len, (void **) &pe) ==
SUCCESS) {
if (pe->status >= data->status) continue;
}
- zend_hash_update(&n->config, str, str_len, data, sizeof(*data),
NULL);
phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", str,
data->status, pe?pe->status:-1));
+ zend_hash_update(&n->config, str, str_len, data, sizeof(*data),
NULL);
}
-
+#endif
return n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
