Commit 0bd08881 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1796446 from trunk: 

PR61124: ap_parse_form_data() EBCDIC fix

URL-decoding doesn't work on EBCDIC.

Submitted By: Hank Ibell <hwibell gmail.com>

(CTR for EBCDIC fix)




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

CHANGES

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


Changes with Apache 2.4.26



  *) core: ap_parse_form_data() URL-decoding doesn't work on EBCDIC

     platforms. PR61124. [Hank Ibell <hwibell gmail.com>]



  *) core: Deprecate ap_get_basic_auth_pw() and add 

     ap_get_basic_auth_components(). 

     [Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener]



  *) Evaluate nested If/ElseIf/Else configuration blocks.

     [Luca Toscano, Jacob Champion]

server/util.c

+4 −22
Original line number Diff line number Diff line
@@ -2666,8 +2666,7 @@ AP_DECLARE(int) ap_parse_form_data(request_rec *r, ap_filter_t *f, 
    ap_form_pair_t *pair = NULL;

    apr_array_header_t *pairs = apr_array_make(r->pool, 4, sizeof(ap_form_pair_t));



    char hi = 0;

    char low = 0;

    char escaped_char[2];



    *ptr = pairs;
@@ -2734,30 +2733,13 @@ AP_DECLARE(int) ap_parse_form_data(request_rec *r, ap_filter_t *f, 
                    continue;

                }

                if (FORM_PERCENTA == percent) {

                    if (c >= 'a') {

                        hi = c - 'a' + 10;

                    }

                    else if (c >= 'A') {

                        hi = c - 'A' + 10;

                    }

                    else if (c >= '0') {

                        hi = c - '0';

                    }

                    hi = hi << 4;

                    escaped_char[0] = c;

                    percent = FORM_PERCENTB;

                    continue;

                }

                if (FORM_PERCENTB == percent) {

                    if (c >= 'a') {

                        low = c - 'a' + 10;

                    }

                    else if (c >= 'A') {

                        low = c - 'A' + 10;

                    }

                    else if (c >= '0') {

                        low = c - '0';

                    }

                    c = low | hi;

                    escaped_char[1] = c;

                    c = x2c(escaped_char);

                    percent = FORM_NORMAL;

                }

                switch (state) {