From: Chris Darroch <chrisd@apache.org>
Date: Fri, 26 May 2006 20:34:48 +0000 (+0000)
Subject: Propose backport of PRs 38621 and 38737.
X-Git-Tag: 2.2.3~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2be2d1cf96d7bb1e6bf1ab8c57de9c774d43f5;p=thirdparty%2Fapache%2Fhttpd.git

Propose backport of PRs 38621 and 38737.


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

diff --git a/STATUS b/STATUS
index 8430836f18e..fb5f75e4ee2 100644
--- a/STATUS
+++ b/STATUS
@@ -128,3 +128,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           Trunk version works
       +1: rpluem
 
+    * Worker and event MPMs: Fix for missing code in handling of
+      GracefulShutdownTimeout.  PR 38621.
+        Trunk version of patch:
+          http://svn.apache.org/viewvc?view=rev&revision=377291
+        2.2.x version of patch:
+          http://issues.apache.org/bugzilla/attachment.cgi?id=18356
+      +1: chrisd
+
+    * Worker MPM: On graceless shutdown or restart, send signals to
+      each worker thread to wake them up if they're polling on a
+      Keep-Alive connection.  PR 38737.
+        Trunk version of patch:
+          http://svn.apache.org/viewvc?view=rev&revision=409715
+        2.2.x version of patch:
+          http://issues.apache.org/bugzilla/attachment.cgi?id=18355
+      +1: chrisd
+