From: Jeff Trawick <trawick@apache.org>
Date: Fri, 15 Sep 2000 16:50:39 +0000 (+0000)
Subject: Fix a bug parsing configuration file containers.  With a sequence
X-Git-Tag: APACHE_2_0_ALPHA_7~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a2e34443e6b58b4760ced6a382d86d377db17e1;p=apache

Fix a bug parsing configuration file containers.  With a sequence
like this in the config file

       <IfModule mod_kilroy.c>
       any stuff
       </IfModule>
       <IfModule mod_lovejoy.c>
       (blank line)
       any stuff
       </IfModule>

the second container would be terminated at the blank line due to
sediment in the buffer from reading the prior </IfModule> and an
error message would be generated for the real </IfModule> for the
second container.  Also due to this problem, any two characters
could be used for "</" in the close of a container.


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

diff --git a/server/config.c b/server/config.c
index 43069215a6..bca1083258 100644
--- a/server/config.c
+++ b/server/config.c
@@ -989,8 +989,9 @@ const char *ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool,
     ap_directive_t *conftree = NULL;
 
     bracket = apr_pstrcat(p, orig_directive + 1, ">", NULL);
-    while(!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
-        if ((strcasecmp(l + 2, bracket) == 0) &&
+    while (!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
+        if (!memcmp(l, "</", 2) &&
+            (strcasecmp(l + 2, bracket) == 0) &&
             (*curr_parent == NULL)) {
             break;
         }