You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@apache.org on 2001/11/23 11:56:31 UTC
cvs commit: httpd-2.0/server config.c
brianp 01/11/23 02:56:31
Modified: server config.c
Log:
restructured the conditional logic in ap_merge_per_dir_configs() for faster execution
Revision Changes Path
1.137 +11 -5 httpd-2.0/server/config.c
Index: config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/config.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- config.c 2001/10/07 04:54:53 1.136
+++ config.c 2001/11/23 10:56:31 1.137
@@ -255,13 +255,19 @@
module *modp;
for (modp = ap_top_module; modp; modp = modp->next) {
- merger_func df = modp->merge_dir_config;
int i = modp->module_index;
- if (df && new_vector[i] && base_vector[i])
- conf_vector[i] = (*df) (p, base_vector[i], new_vector[i]);
- else
- conf_vector[i] = new_vector[i] ? new_vector[i] : base_vector[i];
+ if (!new_vector[i]) {
+ conf_vector[i] = base_vector[i];
+ }
+ else {
+ merger_func df = modp->merge_dir_config;
+ if (df && base_vector[i]) {
+ conf_vector[i] = (*df) (p, base_vector[i], new_vector[i]);
+ }
+ else
+ conf_vector[i] = new_vector[i];
+ }
}
return (ap_conf_vector_t *) conf_vector;