From a7a707f42440668ddbb402e62a0ecd4b639941bd Mon Sep 17 00:00:00 2001 From: Geoffrey Young Date: Wed, 18 Feb 2004 15:44:48 +0000 Subject: [PATCH] fix "Expected > but saw " errors in nested, argumentless containers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102670 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ server/config.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index dcf9552c310..08ac9f1eaf0 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) fix "Expected > but saw " errors in nested, + argumentless containers. + ["Philippe M. Chiasson" ] + *) mod_isapi: GetServerVariable returned improperly terminated header fields given "ALL_HTTP" or "ALL_RAW". PR 20656. [Jesse Pelton ] diff --git a/server/config.c b/server/config.c index 48fa546d93d..d50cfae1a74 100644 --- a/server/config.c +++ b/server/config.c @@ -1287,6 +1287,10 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive) else { const char *msg; + if (*args == '\0' && cmd_name[strlen(cmd_name) - 1] == '>') { + cmd_name[strlen(cmd_name) - 1] = '\0'; + } + if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) { return msg; } -- 2.47.3