From: Jeff Trawick <trawick@apache.org>
Date: Thu, 4 Dec 2003 16:06:55 +0000 (+0000)
Subject: suggest another merge
X-Git-Tag: 2.0.49~313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f203c1a9d31ef3b04dd220a3a4fc2c479a30442;p=thirdparty%2Fapache%2Fhttpd.git

suggest another merge


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

diff --git a/STATUS b/STATUS
index f4e6d34be11..f76528d1cd9 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/04 06:46:26 $]
+Last modified at [$Date: 2003/12/04 16:06:55 $]
 
 Release:
 
@@ -354,6 +354,11 @@ PATCHES TO BACKPORT FROM 2.1
         modules/experimental/mod_mem_cache.c r1.97
       +1: jwoolley, bnicholes
 
+    * Fix a long delay with CGI requests and keepalive connections on
+      AIX.
+        modules/generators/mod_cgid.c r1.159
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,