svn commit: r644730 - /httpd/httpd/trunk/server/core.c

[ni...@apache.org]

Author: niq
Date: Fri Apr  4 07:50:58 2008
New Revision: 644730

URL: http://svn.apache.org/viewvc?rev=644730&view=rev
Log:
Add condition for <If> sections to core config merge
(a fix to r644253)

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=644730&r1=644729&r2=644730&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Apr  4 07:50:58 2008
@@ -229,6 +229,7 @@
     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 @@
         return missing_container_arg(cmd);
     }
 
-    //cmd->path = "*";
     condition = ap_getword_conf(cmd->pool, &arg);
     /* Only if not an .htaccess file */
     if (!old_path) {