Commit 0953460f authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Restore single-char field names inadvertantly disallowed in 2.4.25. 

Backports: r1800173
PR: 61220 
Submitted by: ylavic
Reviewed by: wrowe, jchampion, ylavic



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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 


Changes with Apache 2.4.27



  *) Allow single-char field names inadvertantly disallowed in 2.4.25.

     PR 61220. [Yann Ylavic]



  *) 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]

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -140,15 +140,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      2.4.x patch: svn merge -c 1551611,1783765,1788996,1788998,1789000,1795651 ^/httpd/httpd/trunk .

      +1: jailletc36, jim, ylavic



   *) Restore single-char field names inadvertantly disallowed in 2.4.25.

      Message ID: <CAKQ1sVPrHx911sBDp3-BDsqS=qsQ4Eap0zjSz42j_vuZV2si_g@mail.gmail.com>

      Backports: r1800173

      PR: 61220

      Submitted by: ylavic

      trunk patch: http://svn.apache.org/r1800173 (mod CHANGES)

      2.4 patch: trunk works

      +1: wrowe, ylavic, jchampion





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

server/protocol.c

+6 −9
Original line number Diff line number Diff line
@@ -1088,8 +1088,12 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                    return;

                }



                /* last character of field-name */

                tmp_field = value - (value > last_field ? 1 : 0);

                if (value == last_field) {

                    r->status = HTTP_BAD_REQUEST;

                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03453)

                                  "Request header field name was empty");

                    return;

                }



                *value++ = '\0'; /* NUL-terminate at colon */
@@ -1112,13 +1116,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                                  " bad whitespace");

                    return;

                }



                if (tmp_field == last_field) {

                    r->status = HTTP_BAD_REQUEST;

                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03453)

                                  "Request header field name was empty");

                    return;

                }

            }

            else /* Using strict RFC7230 parsing */

            {