From: Jeff Trawick <trawick@apache.org>
Date: Wed, 5 Nov 2003 00:30:26 +0000 (+0000)
Subject: more merge proposals ;)  one of these, something Martin committed
X-Git-Tag: 2.0.49~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22de4eaacb9647d0751ca8be23fe21888e5bac6d;p=thirdparty%2Fapache%2Fhttpd.git

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 b5752a2270b..d80c96d03fc 100644
--- 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,