From: Jim Jagielski <jim@apache.org>
Date: Mon, 12 Jan 2015 13:38:02 +0000 (+0000)
Subject: Merge r1643825 from trunk:
X-Git-Tag: 2.4.11~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89356fb74860f48d168f9b29cb81fece3edf6b34;p=apache

Merge r1643825 from trunk:

* core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
        PR 57328.

Submitted-by: Armin Abfalterer <a.abfalterer gmail.com>
Reviewed/Committed-by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index f64a05c617..2e5e08ab5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,6 @@ Changes with Apache 2.4.11
   *) SECURITY: CVE-2014-3583 (cve.mitre.org)
      mod_proxy_fcgi: Fix a potential crash due to buffer over-read, with 
      response headers' size above 8K.  [Yann Ylavic, Jeff Trawick]
-
   *) SECURITY: CVE-2014-3581 (cve.mitre.org)
      mod_cache: Avoid a crash when Content-Type has an empty value.
      PR 56924.  [Mark Montague <mark catseye.org>, Jan Kaluza]
@@ -22,6 +21,9 @@ Changes with Apache 2.4.11
      request headers earlier.  Adds "MergeTrailers" directive to restore
      legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
 
+  *) core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. 
+     PR 57328.  [Armin Abfalterer <a.abfalterer gmail.com>, Yann Ylavic].
+
   *) mod_proxy: Preserve original request headers even if they differ
      from the ones to be forwarded to the backend. PR 45387.
      [Yann Ylavic]
diff --git a/STATUS b/STATUS
index ee7ab09b71..fcacd3be08 100644
--- a/STATUS
+++ b/STATUS
@@ -126,12 +126,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
      +1: druggeri, gsmith, rjung
 
-   * core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
-           PR 57328.
-     trunk patch: http://svn.apache.org/r1643825
-     2.4.x patch: trunk works (module CHANGES)
-     +1: ylavic, rjung, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/server/core.c b/server/core.c
index 9c2443baa6..22bb2b14cb 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1271,6 +1271,7 @@ AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word)
 static int reset_config_defines(void *dummy)
 {
     ap_server_config_defines = saved_server_config_defines;
+    saved_server_config_defines = NULL;
     server_config_defined_vars = NULL;
     return OK;
 }