Commit 398f3dde authored by Eric Covener's avatar Eric Covener
Browse files

Merge 1797550 from trunk: 

mod_mime: fix quoted pair scanning


Submitted By: ylavic
Reviewed By: covener, ylavic, jim
 




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

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Changes with Apache 2.4.26



  *) mod_mime: Fix error checking for quoted pairs.  [Yann Ylavic]



  *) mod_proxy_wstunnel: Add "upgrade" parameter to allow upgrade to other

     protocols.  [Jean-Frederic Clere]

STATUS

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

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



   *) mod_mime: Fix scanning of quoted-pairs.

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

      2.4.x patch: svn merge -c 1797550 ^/httpd/httpd/trunk .

      +1: covener, ylavic, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/http/mod_mime.c

+2 −2
Original line number Diff line number Diff line
@@ -528,9 +528,9 @@ static int is_quoted_pair(const char *s) 
    int res = -1;

    int c;



    if (((s + 1) != NULL) && (*s == '\\')) {

    if (*s == '\\') {

        c = (int) *(s + 1);

        if (apr_isascii(c)) {

        if (c && apr_isascii(c)) {

            res = 1;

        }

    }