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

[ja...@apache.org]

Author: jailletc36
Date: Sun Feb 28 10:55:04 2016
New Revision: 1732716

URL: http://svn.apache.org/viewvc?rev=1732716&view=rev
Log:
Fix a bug in <UnDefine ...> directive processing. When used, the last <Define...>'ed variable was also withdrawn.

PR 59019

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=1732716&r1=1732715&r2=1732716&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Feb 28 10:55:04 2016
@@ -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]
 

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1732716&r1=1732715&r2=1732716&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Feb 28 10:55:04 2016
@@ -1493,7 +1493,7 @@ static const char *unset_define(cmd_parm
     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;
         }
     }