]> granicus.if.org Git - apache/commitdiff
Propose missing merge from 2.4.11.
authorYann Ylavic <ylavic@apache.org>
Sun, 1 Mar 2015 01:39:17 +0000 (01:39 +0000)
committerYann Ylavic <ylavic@apache.org>
Sun, 1 Mar 2015 01:39:17 +0000 (01:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1663020 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 2add6d0221522c6ae5f27aa4a489423b488314df..05b383db0bb0441f15306c6c6290bca684eb296f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -261,6 +261,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      ylavic: +1
 
+  *) mpm_event: Clear and restore sbh in notify_suspend() and notify_resume()
+     respectively.  This merges a missing fix from r1545736 (sbh = NULL before
+     notify_suspend() for write completion, near line 1068 in 2.4.12) which was
+     missed between r1541207 and r1642858.
+     trunk patch: http://svn.apache.org/r1663017
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mpm_event-notify_suspend_sbh.patch
+                  (trunk works, but the above contains the CHANGES entry, which is 2.4.x only...)
+     ylavic: +1
+
 
 OTHER PROPOSALS