Get tree build to work correctly with config Include directive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85172 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/config.c b/server/config.c
index 7b9e70ce1da8c77179e04d29401e6f4787efb045..bb4cbb52468b8ab3d5eea8bf11caf18b594701d2 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -974,6 +974,9 @@ API_EXPORT(const char *) ap_build_config(configfile_t *cfp,
        if (errmsg != NULL)
            return errmsg;
 
+        if (*conftree == NULL && curr_parent != NULL) { 
+            *conftree = curr_parent;
+        }
         if (*conftree == NULL && current != NULL) {
             *conftree = current;
         }