From: Eric Covener Date: Fri, 28 Aug 2015 15:44:29 +0000 (+0000) Subject: On ebcdic systems, make sure E2A conversion happens last, X-Git-Tag: 2.5.0-alpha~2904 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ad5972894c12e45f78196b1497e4fc8247a9dd;p=thirdparty%2Fapache%2Fhttpd.git On ebcdic systems, make sure E2A conversion happens last, so other resource filters looking at or adding ebcdic strings see ebcdic bytes. e.g. SSI in an EBCDIC file. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698357 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index af36d7e4cdb..62d04eeebc6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_charset_lite: On EBCDIC platforms, make sure mod_charset_lite runs + after other resource-level filters. [Eric Covener] + *) mod_dir: Responses that go through "FallbackResource" might appear to hang due to unterminated chunked encoding. PR58292. [Eric Covener] diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c index d991c12bbd9..aa46dc3852b 100644 --- a/modules/filters/mod_charset_lite.c +++ b/modules/filters/mod_charset_lite.c @@ -1123,10 +1123,17 @@ static void charset_register_hooks(apr_pool_t *p) { ap_hook_fixups(find_code_page, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_insert_filter(xlate_insert_filter, NULL, NULL, APR_HOOK_REALLY_LAST); +#if APR_CHARSET_EBCDIC + ap_register_output_filter(XLATEOUT_FILTER_NAME, xlate_out_filter, NULL, + AP_FTYPE_RESOURCE+1); + ap_register_input_filter(XLATEIN_FILTER_NAME, xlate_in_filter, NULL, + AP_FTYPE_RESOURCE+1); +#else ap_register_output_filter(XLATEOUT_FILTER_NAME, xlate_out_filter, NULL, AP_FTYPE_RESOURCE); ap_register_input_filter(XLATEIN_FILTER_NAME, xlate_in_filter, NULL, AP_FTYPE_RESOURCE); +#endif } AP_DECLARE_MODULE(charset_lite) =