more merge proposals ;) one of these, something Martin committed

a while back, is a showstopper for EBCDIC platforms

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

diff --git a/STATUS b/STATUS
index b5752a2270b259d665a935dbc9601bcd5bf4d358..d80c96d03fcef2920c323640346e279111c78ff4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/03 21:59:58 $]
+Last modified at [$Date: 2003/11/05 00:30:26 $]
 
 Release:
 
@@ -314,6 +314,14 @@ PATCHES TO BACKPORT FROM 2.1
         modules/generators/mod_autoindex.c: r1.125
       +1: nd
 
+    * EBCDIC: Translate the protocol data...  SHOWSTOPPER
+        modules/http/http_protocol.c: r1.469
+      +1: trawick
+
+    * os/unix/unixd.c portability issue (ushort vs. unsigned short)
+        os/unix/unixd.c: r1.61
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,