From: Eric Covener <covener@apache.org>
Date: Wed, 21 Apr 2021 01:14:12 +0000 (+0000)
Subject: vote/promote [skip ci]
X-Git-Tag: 2.4.47~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54c9870f8b0e60f6767cebf24a574e422375084b;p=thirdparty%2Fapache%2Fhttpd.git

vote/promote [skip ci]



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

diff --git a/STATUS b/STATUS
index 17ff1aa675f..bd21d9bc46d 100644
--- a/STATUS
+++ b/STATUS
@@ -139,6 +139,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_cgid: Register cleanup for socket earlier to avoid possible leaks on
+     error paths
+     trunk patch: http://svn.apache.org/r1887727
+     2.4.x patch: svn merge -c 1887727 ^/httpd/httpd/trunk .
+     +1: ylavic, icing, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -178,12 +183,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1888266 ^/httpd/httpd/trunk .
      +1: ylavic, icing
 
-  *) mod_cgid: Register cleanup for socket earlier to avoid possible leaks on
-     error paths
-     trunk patch: http://svn.apache.org/r1887727
-     2.4.x patch: svn merge -c 1887727 ^/httpd/httpd/trunk .
-     +1: ylavic, icing
-
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
      2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .