Commit 1485d646 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1753257 from trunk: 

Restore 'HEAD' method as a special case of GET with the common ID
Submitted by: wrowe
Reviewed/backported by: jim


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

STATUS

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

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



  *) mod_http: Add the HEAD method to the lookup hash for completeness.

      Trunk version of patch:

         http://svn.apache.org/r1753257

      Backport version for 2.4.x of patch:

         Trunk version of patch works

      +1: wrowe, ylavic, sf



  *) mod_dav: fix typo (missing '/') in closing tag (follow up to r1756560

     which backported r1746207 in 2.4.24). Plus r1748155 to fix compiling with

     clang.

modules/http/http_protocol.c

+4 −1
Original line number Diff line number Diff line
@@ -688,8 +688,11 @@ AP_DECLARE(void) ap_method_registry_init(apr_pool_t *p) 
                              apr_pool_cleanup_null);



    /* put all the standard methods into the registry hash to ease the

       mapping operations between name and number */

     * mapping operations between name and number

     * HEAD is a special-instance of the GET method and shares the same ID

     */

    register_one_method(p, "GET", M_GET);

    register_one_method(p, "HEAD", M_GET);

    register_one_method(p, "PUT", M_PUT);

    register_one_method(p, "POST", M_POST);

    register_one_method(p, "DELETE", M_DELETE);