From 0adfe54ed6b62da75d044975d6c9e09f5a2601be Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sat, 27 May 2017 20:16:14 +0000 Subject: [PATCH] Merge r1796446 from trunk: PR61124: ap_parse_form_data() EBCDIC fix URL-decoding doesn't work on EBCDIC. Submitted By: Hank Ibell (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 --- CHANGES | 7 +++++++ server/util.c | 26 ++++---------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index ee79766529..4e2983f00c 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] + + *) core: Deprecate ap_get_basic_auth_pw() and add + ap_get_basic_auth_components(). + [Emmanuel Dreyfus , Jacob Champion, Eric Covener] + *) Evaluate nested If/ElseIf/Else configuration blocks. [Luca Toscano, Jacob Champion] diff --git a/server/util.c b/server/util.c index fba34bde1a..6667ac2e46 100644 --- a/server/util.c +++ b/server/util.c @@ -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) { -- 2.40.0