From: Stefan Eissing <icing@apache.org>
Date: Thu, 1 Sep 2016 15:56:20 +0000 (+0000)
Subject: vote and accept
X-Git-Tag: 2.4.24~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77e268fa9738a7aedaae034920a43224aec08225;p=thirdparty%2Fapache%2Fhttpd.git

vote and accept

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

diff --git a/STATUS b/STATUS
index d28c38520f9..9e7066d00ca 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_cgid: Wrong CGI process killed when a small CGI response is followed
+     by another CGI request, because of min bytes to write in core output filter
+     delaying the pool cleanup.  Likely fixes PR57771 too.
+     trunk patch: http://svn.apache.org/r1758083
+     2.4.x: trunk works modulo CHANGES
+     +1 covener, jim, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -193,13 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1750392.patch
      +1: ylavic
 
-   * mod_cgid: Wrong CGI process killed when a small CGI response is followed
-     by another CGI request, because of min bytes to write in core output filter
-     delaying the pool cleanup.  Likely fixes PR57771 too.
-     trunk patch: http://svn.apache.org/r1758083
-     2.4.x: trunk works modulo CHANGES
-     +1 covener, jim
-
    * mpm_winnt: disable the 'data' accept filter entirely to prevent denial of
      service. PR 59970.
      trunk patch: http://svn.apache.org/r1758307