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 20b120f8c72647840369ed88a402a816a9c86a02..9e610631fc8fa96d63debe57ba9f9aed96b236b9 100644 (file)
--- 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;