svn commit: r1621603 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/config.c

[ji...@apache.org]

Author: jim
Date: Sun Aug 31 16:09:08 2014
New Revision: 1621603

URL: http://svn.apache.org/r1621603
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/config.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1618541

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1621603&r1=1621602&r2=1621603&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Aug 31 16:09:08 2014
@@ -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>]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1621603&r1=1621602&r2=1621603&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Aug 31 16:09:08 2014
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/config.c?rev=1621603&r1=1621602&r2=1621603&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/config.c (original)
+++ httpd/httpd/branches/2.4.x/server/config.c Sun Aug 31 16:09:08 2014
@@ -1607,11 +1607,7 @@ AP_DECLARE(const char *) ap_soak_end_con
 
     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] == '<') {