From: Jeff Trawick <trawick@apache.org>
Date: Sat, 10 Apr 2004 21:35:28 +0000 (+0000)
Subject: propose yet another merge
X-Git-Tag: 2.0.50~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=905961ea98f9ddacb56aa2274135736f5649ace5;p=thirdparty%2Fapache%2Fhttpd.git

propose yet another merge


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

diff --git a/STATUS b/STATUS
index b53a9a57a24..f32cdd72196 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/10 21:06:45 $]
+Last modified at [$Date: 2004/04/10 21:35:28 $]
 
 Release:
 
@@ -374,6 +374,15 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.98&r2=1.99
       +1: trawick, stoddard
 
+    * Unix MPMs: Stop dropping connections when the file descriptor
+      is at least FD_SETSIZE
+        os/unix/unixd.c: r1.63
+        server/mpm/experimental/leader/leader.c: r1.37
+        server/mpm/experimental/perchild/perchild.c: r1.143
+        server/mpm/experimental/threadpool/threadpool.c: r1.25
+        server/mpm/worker/worker.c: r1.145
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,