Report unbounded containers in the config file. Previously, a typo

in the </container> directive could result in the rest of the config
file being silently ignored, with undesired defaults used.

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

diff --git a/CHANGES b/CHANGES
index bcebe838d73fff9082a77e15a0f4882d84fb7ca2..1026446531cf77ad1d0378fcfbaba4d5261471e3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.14-dev
 
+  *) Report unbounded containers in the config file.  Previously, a typo
+     in the </container> directive could result in the rest of the config
+     file being silently ignored, with undesired defaults used.
+     [Jeff Trawick]
+
   *) Make the old_write filter use the ap_f* functions for the buffering.
      [Ryan Bloom]
 

diff --git a/server/config.c b/server/config.c
index d6c0284742b3b4658876a0ed1f6da98c34feb72d..38abcc8cc86f0ebbbd2b70b67045f976c0efb16d 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1137,14 +1137,20 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
                                       directive + 1, "> but saw ",
                                       cmd_name, ">", NULL);
                 }
-                break;
+                return NULL; /* found end of container */
             }
             else {
-                ap_soak_end_container(cmd, cmd_name);
+                const char *msg;
+
+                if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) {
+                    return msg;
+                }
             }
         }
     }
-    return NULL;
+    return apr_pstrcat(cmd->pool, "Expected </",
+                       directive + 1, "> before end of configuration",
+                       NULL);
 }
 
 static const char *execute_now(char *cmd_line, const char *args, cmd_parms *parms,