From 70293d44cb7bbd60eee688aa6a2554dcde1fed61 Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Fri, 4 Apr 2008 14:50:58 +0000 Subject: [PATCH] Add condition for sections to core config merge (a fix to r644253) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@644730 13f79535-47bb-0310-9956-ffa450edef68 --- server/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core.c b/server/core.c index f6c987643c..30353e12d4 100644 --- a/server/core.c +++ b/server/core.c @@ -229,6 +229,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) conf->d_is_fnmatch = new->d_is_fnmatch; conf->d_components = new->d_components; conf->r = new->r; + conf->condition = new->condition; if (new->opts & OPT_UNSET) { /* there was no explicit setting of new->opts, so we merge @@ -2023,7 +2024,6 @@ static const char *ifsection(cmd_parms *cmd, void *mconfig, const char *arg) return missing_container_arg(cmd); } - //cmd->path = "*"; condition = ap_getword_conf(cmd->pool, &arg); /* Only if not an .htaccess file */ if (!old_path) { -- 2.40.0