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

Merge r1773162 from trunk: 

After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.


Submitted by: wrowe
Reviewed/backported by: jim


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

STATUS

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

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



  *) With oddball whitespace now disallowed, strictness makes no difference

     in the two cases of field content handling. Noted by rpluem.

     Backports: r1773162 through merge branch commit r1773163

     Trunk patch:

       https://svn.apache.org/r1773162

     2.4.x patch:

       https://svn.apache.org/r1773163

     +1: wrowe, jim, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/http/http_filters.c

+1 −11
Original line number Diff line number Diff line
@@ -715,17 +715,7 @@ static int check_header(void *arg, const char *name, const char *val) 
        return 0;

    }



    if (ctx->strict) { 

    test = ap_scan_http_field_content(val);

    }

    else {

        /* Simply terminate scanning on a CTL char, allowing whitespace */

        test = val;

        do {

            while (*test == ' ' || *test == '\t') test++;

            test = ap_scan_vchar_obstext(test);

        } while (*test == ' ' || *test == '\t');

    }

    if (*test) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02430)

                      "Response header '%s' value of '%s' contains invalid "