From 4626afdd3a056a7cf2685ca9c2f21fe481cb2895 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Sun, 1 Mar 2015 01:39:17 +0000 Subject: [PATCH] Propose missing merge from 2.4.11. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1663020 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/STATUS b/STATUS index 2add6d0221..05b383db0b 100644 --- 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 -- 2.40.0