From: Jim Jagielski <jim@apache.org>
Date: Sun, 31 Aug 2014 16:09:08 +0000 (+0000)
Subject: Merge r1618541 from trunk:
X-Git-Tag: 2.4.11~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38213457d75cb1d6eabd140f6c0137f8a6cdb602;p=apache

Merge r1618541 from trunk:

Avoid useless warning message when parsing a section guarded by <IfDefine foo> if $(foo) is used within the section.
PR 56503

Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1621603 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 60a0e222d1..d39bbdd8f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.11
 
+  *) core: Avoid useless warning message when parsing a section guarded by
+     <IfDefine foo> if $(foo) is used within the section.
+     PR 56858 [Christophe Jaillet]
+
   *) mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
      application.  PR 56858.  [Manuel Mausz <manuel-asf mausz.at>]
 
diff --git a/STATUS b/STATUS
index 0394c3e591..07fe297085 100644
--- a/STATUS
+++ b/STATUS
@@ -101,11 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: Avoid useless warning message when parsing a section guarded by
-     <IfDefine foo> if $(foo) is used within the section.  PR56503
-     trunk patch: http://svn.apache.org/r1618541
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: jailletc36, ylavic, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/server/config.c b/server/config.c
index 996135858f..dada063c06 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1607,11 +1607,7 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
 
     while((rc = ap_varbuf_cfg_getline(&vb, cmd->config_file, max_len))
           == APR_SUCCESS) {
-#if RESOLVE_ENV_PER_TOKEN
         args = vb.buf;
-#else
-        args = ap_resolve_env(cmd->temp_pool, vb.buf);
-#endif
 
         cmd_name = ap_getword_conf(cmd->temp_pool, &args);
         if (cmd_name[0] == '<') {