From: Jim Jagielski <jim@apache.org>
Date: Thu, 10 Oct 2013 14:31:20 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.7~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5194787f66d048b65abf44e528a562ea71a5deab;p=apache

promote


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

diff --git a/STATUS b/STATUS
index 4378881682..9c7620a5fa 100644
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
+  * core: Don't truncate output when sending is interrupted by a signal,
+          such as from an exiting CGI process. PR 55643.
+    trunk: https://svn.apache.org/r1530793
+    2.4.x: trunk works
+    +1: trawick, covener, jim
+
+  * WinNT MPM: Exit the child if the parent process crashes or is terminated.
+    trunk: https://svn.apache.org/r1526666 and r1527220
+    2.4.x: trunk patches work if CHANGES are massaged and log-message-tag change
+           is ignored; alternately:
+           http://people.apache.org/~trawick/winnt-child-exits-if-no-parent.txt
+    +1: trawick, covener, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -195,19 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x: trunk works, CHANGES needs to be written when merging
     +1: breser
 
-  * core: Don't truncate output when sending is interrupted by a signal,
-          such as from an exiting CGI process. PR 55643.
-    trunk: https://svn.apache.org/r1530793
-    2.4.x: trunk works
-    +1: trawick, covener, jim
-
-  * WinNT MPM: Exit the child if the parent process crashes or is terminated.
-    trunk: https://svn.apache.org/r1526666 and r1527220
-    2.4.x: trunk patches work if CHANGES are massaged and log-message-tag change
-           is ignored; alternately:
-           http://people.apache.org/~trawick/winnt-child-exits-if-no-parent.txt
-    +1: trawick, covener, jim
-
 A list of further possible backports can be found at:                                                                                                                                   
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.