From: Jeff Trawick <trawick@apache.org>
Date: Tue, 30 May 2000 14:20:46 +0000 (+0000)
Subject: Ensure that the proper translation handle (if any) is used when
X-Git-Tag: APACHE_2_0_ALPHA_4~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7685b72c19e4b242527c3c1eba2600874955c86;p=apache

Ensure that the proper translation handle (if any) is used when
sending the canned response document to the client.  Otherwise, the
client may get garbage depending on the translation in effect.


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

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 20b120f8c7..9e610631fc 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2641,6 +2641,14 @@ API_EXPORT(void) ap_send_error_response(request_rec *r, int recursive_error)
         while (r->prev && (r->prev->status != HTTP_OK))
             r = r->prev;
     }
+#ifdef APACHE_XLATE
+    /* Ensure that the proper translation handle (if any) is used when
+     * sending the canned response document to the client.  Note that
+     * on an ASCII machine, ap_hdrs_to_ascii is NULL, so this will
+     * turn off any translation selected by a module for content.
+     */
+    ap_set_content_xlate(r, 1, ap_hdrs_to_ascii);
+#endif
     {
         const char *title = status_lines[idx];
         const char *h1;