svn commit: r1643825 - in /httpd/httpd/trunk: CHANGES server/core.c

[yl...@apache.org]

Author: ylavic
Date: Mon Dec  8 14:29:13 2014
New Revision: 1643825

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1643825&r1=1643824&r2=1643825&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Dec  8 14:29:13 2014
@@ -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]
 

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1643825&r1=1643824&r2=1643825&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Mon Dec  8 14:29:13 2014
@@ -1308,6 +1308,7 @@ AP_DECLARE(const char *) ap_resolve_env(
 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;
 }