From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 18 Aug 2014 06:08:00 +0000 (+0000)
Subject: Avoid useless warning message when parsing a section guarded by <IfDefine foo> if... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=044926f0713865c574bc620852b15e14d03d44e7;p=thirdparty%2Fapache%2Fhttpd.git

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

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

diff --git a/CHANGES b/CHANGES
index 615cec02669..d1202da704d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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/server/config.c b/server/config.c
index e48d37016f6..50fa76d98c2 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] == '<') {