From: Stefan Eissing <icing@apache.org>
Date: Wed, 2 Mar 2016 13:05:01 +0000 (+0000)
Subject: backport of PR 59019 fix
X-Git-Tag: 2.4.19~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd5a20aacff21c151c3b1b4c26afc2809d577cbc;p=apache

backport of PR 59019 fix

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

diff --git a/CHANGES b/CHANGES
index fc31499e8a..91bad98273 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.19
 
+  *) core: fix a bug in <UnDefine ...> directive processing. When used, the last
+     <Define...>'ed variable was also withdrawn. PR 59019
+     [Christophe Jaillet]
+
   *) mod_http2: Accept-Encoding is, when present on the initiating request, 
      added to push promises. This lets compressed content work in pushes.
      by the client. [Stefan Eissing]
diff --git a/STATUS b/STATUS
index 43dcff5817..96672871d8 100644
--- a/STATUS
+++ b/STATUS
@@ -112,14 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: Fix a bug in <UnDefine ...> directive processing. When used, the
-           last <Define...>'ed variable was also withdrawn. PR 59019
-     Trunk patch:
-         http://svn.apache.org/r1732716
-     2.4.x patch:
-         Trunk version of patch works (modulo CHNAGES)
-     +1: jailletc36, ylavic, icing
-
   *) Save a few bytes in conf pool when parsing some directives
      Trunk patch:
          http://svn.apache.org/r1732252
diff --git a/server/core.c b/server/core.c
index 4dd8200d36..024bf8ddc3 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1362,7 +1362,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;
         }
     }