Fix charset translation breakage on EBCDIC machines... the core turned

on buff's translation by default, but mod_charset_lite (when configured
to do so) turned on its own filter-based translation, resulting in
gibberish.

To be determined... whether or not mod_charset_lite should enable
translation of text objects by default (a la 1.3)...  probably... for
now you have to tell mod_charset_lite to translate.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86135 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 4f1b9b382f3ce325c4509742c56bf78c40e23f98..6f385a7fdf03b4857c9be0cea97af95f9c75a8e9 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1176,7 +1176,6 @@ request_rec *ap_read_request(conn_rec *conn)
 
 #ifdef APACHE_XLATE
     r->rrx = apr_pcalloc(p, sizeof(struct ap_rr_xlate));
-    ap_set_content_xlate(r, 1, ap_locale_to_ascii);
     ap_set_content_xlate(r, 0, ap_locale_from_ascii);
 #endif /*APACHE_XLATE*/
 

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 2ee40064d11e25e5fd4e1f2542e220b8626dae83..f6b0b1a5a790a2a1ee46f728d2765153296e9e01 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -1388,7 +1388,6 @@ static request_rec *internal_internal_redirect(const char *new_uri, request_rec
 
 #ifdef APACHE_XLATE
     new->rrx = apr_pcalloc(new->pool, sizeof(struct ap_rr_xlate));
-    ap_set_content_xlate(new, 1, ap_locale_to_ascii);
     ap_set_content_xlate(new, 0, ap_locale_from_ascii);
 #endif /*APACHE_XLATE*/