Fix a bug in <UnDefine ...> directive processing. When used, the last <Define......

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 24b8b5d87ecffc01f092cc67a4bcc3f2b9be443a..4aba9999391883ffdf84635ab67118addd1021e7 100644 (file)
--- 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 0300e6479e705268bcc9ab134c9a0b1f3fa09cb3..f0c6c5c8139fd46a1f07ada06e59a800dc1134ea 100644 (file)
--- 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;
         }
     }