Commit de0e7098 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.2.x@1800216 13f79535-47bb-0310-9956-ffa450edef68
parent edef3767

CHANGES

+2 −1
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.34





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

     PR 61220. [Yann Ylavic]



Changes with Apache 2.2.33

STATUS

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

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



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

      Backports: r1800173

      PR: 61220

      Submitted by: ylavic

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

      2.2.x patch: https://home.apache.org/~jchampion/patches/2.2.x-allow-single-char-headers.patch

      +1: wrowe, jchampion, ylavic





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
@@ -1081,8 +1081,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,

                                  "Request header field name was empty");

                    return;

                }



                *value++ = '\0'; /* NUL-terminate at colon */
@@ -1105,13 +1109,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,

                                  "Request header field name was empty");

                    return;

                }

            }

            else /* Using strict RFC7230 parsing */

            {