merge this from 2.1-dev:

  EBCDIC: Convert header fields to ASCII before sending (broken
  since 2.0.44).

Submitted by: Martin Kraemer
Reviewed by:  trawick, nd, gregames

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

diff --git a/CHANGES b/CHANGES
index 000ca58fd5104f0f03c4fd90423c989d5c78b1c7..fff2770686d5e825a7630c86a2a9e24f7d9c7481 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) EBCDIC: Convert header fields to ASCII before sending (broken
+     since 2.0.44). [Martin Kraemer]
+
   *) Fix the inability to log errors like exec failure in
      mod_ext_filter/mod_cgi script children.  This was broken after 
      such children stopped inheriting the error log handle.  

diff --git a/STATUS b/STATUS
index 615c18ac18a1b89540986d7a1dbb5453a8a25553..a8e46bee63471b93b11050accad1de8ec1cc5c43 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/20 19:42:30 $]
+Last modified at [$Date: 2003/11/20 19:52:41 $]
 
 Release:
 
@@ -62,10 +62,6 @@ Contributors looking for a mission:
 
 RELEASE SHOWSTOPPERS:
 
-    * EBCDIC: Translate the protocol data...
-        modules/http/http_protocol.c: r1.469, r1.472
-      +1: trawick, nd, gregames
-
 PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index e80c531eaf40b00becd447b82f14fdb27c8af1ba..43936fbfb34e609f8c1730c9a6120d884b503dc3 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1196,7 +1196,16 @@ static apr_status_t send_all_header_fields(header_struct *h,
         t_elt++;
     } while (t_elt < t_end);
 
+#if APR_CHARSET_EBCDIC
+    {
+        apr_size_t len;
+        char *tmp = apr_pstrcatv(r->pool, vec, vec_next - vec, &len);
+        ap_xlate_proto_to_ascii(tmp, len);
+        return apr_brigade_write(h->bb, NULL, NULL, tmp, len);
+    }
+#else
     return apr_brigade_writev(h->bb, NULL, NULL, vec, vec_next - vec);
+#endif
 }
 
 /*