From: Stefan Eissing <icing@apache.org>
Date: Thu, 28 May 2020 15:43:48 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.4.44~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12f1b4033bca7f7bceda877caefea334075ce73c;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote

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

diff --git a/STATUS b/STATUS
index 2154b9756e0..1caf973a6f0 100644
--- a/STATUS
+++ b/STATUS
@@ -150,6 +150,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1877783 ^/httpd/httpd/trunk .
      +1: icing, steffenal, rpluem
 
+  *) mod_ssl: Fix memory leak in stapling code. PR63687.
+     trunk patch:
+       - http://svn.apache.org/r1876548
+     2.4.x patch: svn merge -c 1876548 ^/httpd/httpd/trunk .
+     +1: gbechis, jorton, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -172,12 +178,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) mod_ssl: Fix memory leak in stapling code. PR63687.
-     trunk patch:
-       - http://svn.apache.org/r1876548
-     2.4.x patch: svn merge -c 1876548 ^/httpd/httpd/trunk .
-     +1: gbechis, jorton
-
   *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
      trunk patch: 
         - http://svn.apache.org/r1877829