Avoid useless warning message when parsing a section guarded by <IfDefine foo> if...

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 615cec02669a8f240664729c4fe49e32e0290043..d1202da704df3639c33df9e58479f01e562c4a7e 100644 (file)
--- 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 e48d37016f6a2344fa500b0570e719f1efc56c9e..50fa76d98c23f0a5e93dae5713fed9b3a9e9035e 100644 (file)
--- 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] == '<') {