From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 30 May 2008 22:11:12 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.9~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc278f0685b3048d8989ced8bfcf7065f42c5b6f;p=thirdparty%2Fapache%2Fhttpd.git

* Promote


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

diff --git a/STATUS b/STATUS
index 5b1dbcb8c4d..a6012dc2574 100644
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,31 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * prefork: prefork's apr_pollset_poll() loop-on-EINTR loop was not checking
+  die_now; the child holding the mutex will not die immediately if poll
+  fails with EINTR, and will hence appear to "hang" until a new connection
+  is recevied.
+   Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=613260
+   Backport version for 2.2.x of patch:
+         Trunk version of patch works
+    +1: jim, jorton, rpluem
+
+ * prefork: Unlock mutex before terminating.
+   Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=613252
+   Backport version for 2.2.x of patch:
+         Trunk version of patch works
+    +1: jim, jorton, rpluem
+
+ * prefork: Stop processing new connections if shutdown_pending is set,
+   i.e. when SIGTERM is received in single-process mode.
+   PR 38848
+   Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=552029
+   Backport version for 2.2.x of patch:
+         Trunk version of patch works
+    +1: jim, jorton, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -149,32 +174,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
     +1: rpluem, jim
 
- * prefork: prefork's apr_pollset_poll() loop-on-EINTR loop was not checking
-  die_now; the child holding the mutex will not die immediately if poll
-  fails with EINTR, and will hence appear to "hang" until a new connection
-  is recevied.
-   Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=613260
-   Backport version for 2.2.x of patch:
-         Trunk version of patch works
-    +1: jim, jorton, rpluem
-
- * prefork: Unlock mutex before terminating.
-   Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=613252
-   Backport version for 2.2.x of patch:
-         Trunk version of patch works
-    +1: jim, jorton, rpluem
-
- * prefork: Stop processing new connections if shutdown_pending is set,
-   i.e. when SIGTERM is received in single-process mode.
-   PR 38848
-   Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=552029
-   Backport version for 2.2.x of patch:
-         Trunk version of patch works
-    +1: jim, jorton, rpluem
-
  * proxy_balancer: Prevent CSRF attacks against the balancer-manager
    (CVE-2007-6420)
    Trunk version of patch: