From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 8 Dec 2014 14:29:13 +0000 (+0000)
Subject: * core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
X-Git-Tag: 2.5.0-alpha~3621
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfdb0ece3eaa662b6dc171c308b49bf89eb5238e;p=apache

* 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


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

diff --git a/CHANGES b/CHANGES
index 5aa969049c..1203ecb7b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
   
+  *) core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. 
+     PR 57328.  [Armin Abfalterer <a.abfalterer gmail.com>, Yann Ylavic].
+
   *) mod_proxy_ajp: Fix client connection errors handling and logged status
      when it occurs.  PR 56823.  [Yann Ylavic]
 
diff --git a/server/core.c b/server/core.c
index 693283c859..bc6ae0820b 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1308,6 +1308,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;
 }