From: Nick Kew <niq@apache.org>
Date: Fri, 4 Apr 2008 14:50:58 +0000 (+0000)
Subject: Add condition for <If> sections to core config merge
X-Git-Tag: 2.3.0~819
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70293d44cb7bbd60eee688aa6a2554dcde1fed61;p=thirdparty%2Fapache%2Fhttpd.git

Add condition for <If> 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
---

diff --git a/server/core.c b/server/core.c
index f6c987643ce..30353e12d44 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) {