Commit e7c35344 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1799784, r1799786 from trunk: 

Since r1753257, "HEAD" method is registered into the registry hash with the M_GET ID.
(r1757672 in 2.4.x)

We iterate over all the values of the registery, so there is no need anymore to have a special case for "HEAD" in  'make_allow()'. It has its own entry now.

With the current code, we have "HEAD" 3 times in the Allow Header field.
This is because we find M_GET 2 times in the registry hash. The first one gives "GET" and "HEAD" (as the special handling), and the second "HEAD" and "HEAD" (as the special handling).


BTW, use APR_ARRAY_PUSH instead of hand coding it, in oder to have the code more readable.

PR 61207

Add  CHANGE entry
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, jim


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

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-





Changes with Apache 2.4.27



  *) core: Avoid duplicate HEAD in Allow header.

     This is a regression in 2.4.24 (unreleased), 2.4.25 and 2.4.26.

     PR 61207. [Christophe Jaillet]



Changes with Apache 2.4.26

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   *) core: Avoid duplicate HEAD in Allow header. PR 61207.

      trunk patch: http://svn.apache.org/r1799784

                   http://svn.apache.org/r1799786 (CHANGES entry)

      2.4.x patch: svn merge -c 1799784,1799786 ^/httpd/httpd/trunk .

      +1: jailletc36, rpluem, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/http/http_protocol.c

+1 −5
Original line number Diff line number Diff line
@@ -1037,11 +1037,7 @@ static char *make_allow(request_rec *r) 


        apr_hash_this(hi, &key, NULL, &val);

        if ((mask & (AP_METHOD_BIT << *(int *)val)) != 0) {

            *(const char **)apr_array_push(allow) = key;



            /* the M_GET method actually refers to two methods */

            if (*(int *)val == M_GET)

                *(const char **)apr_array_push(allow) = "HEAD";

            APR_ARRAY_PUSH(allow, const char *) = key;

        }

    }