Commit 8273285f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

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
parent 4b98d0c4

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -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

server/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }