From d22f08e680c3b21474ad8b8c0d9ebdb319f7006d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 16 Dec 2014 13:05:23 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1645933 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 37b9801bca..d33138c208 100644 --- a/STATUS +++ b/STATUS @@ -111,6 +111,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk works other than CHANGES +1: trawick, covener, ylavic + * mpm_event: Notify suspend in any case when starting lingering close (blocking), + and outside the lingering queue's critical section. + This is a follow up to r1639614 already backported to 2.4.11 as r1642858. + So it (probably) does not need its own CHANGES entry. + trunk patch: http://svn.apache.org/r1642868 + 2.4.x patch: trunk works (CHANGES + +1: ylavic, covener, jim + + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -224,14 +233,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk works +1 covener, jim - * mpm_event: Notify suspend in any case when starting lingering close (blocking), - and outside the lingering queue's critical section. - This is a follow up to r1639614 already backported to 2.4.11 as r1642858. - So it (probably) does not need its own CHANGES entry. - trunk patch: http://svn.apache.org/r1642868 - 2.4.x patch: trunk works (CHANGES - +1: ylavic, covener, jim - * core: Add ap_log_data(), ap_log_rdata(), etc. for logging buffers. trunk patch: http://svn.apache.org/r1512819 http://svn.apache.org/r1513461 ONLY the change to http_log.h -- 2.50.1