From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 28 Feb 2016 10:55:04 +0000 (+0000)
Subject: Fix a bug in <UnDefine ...> directive processing. When used, the last <Define...... 
X-Git-Tag: 2.5.0-alpha~1999
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a429d04f29da8b5e16011265dc2e9702b6ab2b70;p=thirdparty%2Fapache%2Fhttpd.git

Fix a bug in <UnDefine ...> directive processing. When used, the last <Define...>'ed variable was also withdrawn.

PR 59019

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

diff --git a/CHANGES b/CHANGES
index 24b8b5d87ec..4aba9999391 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core: fix a bug in <UnDefine ...> directive processing. When used, the last
+     <Define...>'ed variable was also withdrawn. PR 59019
+     [Christophe Jaillet]
+
   *) mod_http2: limiting the amount of h2 workers a HTTP/2 connection can
      occupy at a time to make DoS life harder. Limiting this to static 6 in
      honor of http/1.1 connection limits, considering implementing dynamic
@@ -8,7 +12,7 @@ Changes with Apache 2.5.0
      This does *not* limit the number of streams a client may open, rather the
      number of server threads a connection might use.
      [Stefan Eissing]
-     
+
   *) mod_auth_digest: Fix compatibility with expression-based Authname. PR59039.
      [Eric Covener]
 
diff --git a/server/core.c b/server/core.c
index 0300e6479e7..f0c6c5c8139 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1493,7 +1493,7 @@ static const char *unset_define(cmd_parms *cmd, void *dummy,
     defines = (char **)ap_server_config_defines->elts;
     for (i = 0; i < ap_server_config_defines->nelts; i++) {
         if (strcmp(defines[i], name) == 0) {
-            defines[i] = apr_array_pop(ap_server_config_defines);
+            defines[i] = *(char **)apr_array_pop(ap_server_config_defines);
             break;
         }
     }