* 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 5aa969049c0d1d4df33987c0b4e4cef216349782..1203ecb7b7dc8e355797b5fae30ac582700ed7f4 100644 (file)
--- 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 693283c8596a51198ae93aada63a868932eaf7f1..bc6ae0820b00f4321d78c6aa46e586d2a1ad667f 100644 (file)
--- 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;
 }