From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 23 Mar 2020 17:51:27 +0000 (+0000)
Subject: Vote, promote. [skip ci]
X-Git-Tag: 2.4.43~12
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=53135f5f81a802748b7a959a5abe16af374fe871;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote. [skip ci]

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

diff --git a/STATUS b/STATUS
index 829f8c27a6b..1d08fda16b0 100644
--- a/STATUS
+++ b/STATUS
@@ -134,6 +134,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Fix memory leak of OCSP stapling response.
+              The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
+              TLS response/handshake extension, so it must be freed.
+     trunk patch: http://svn.apache.org/r1874577
+     2.4.x patch: svn merge -c 1874577 ^/httpd/httpd/trunk .
+     +1: gbechis, rpluem, ylavic
+
+  *) mod_ssl: Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
+              SSL_CTX_get_min_proto_version() and SSL_CTX_get_max_proto_version()
+              were only introduced in 1.1.0g.
+     trunk patch: http://svn.apache.org/r1875544
+     2.4.x patch: svn merge -c 1875544 ^/httpd/httpd/trunk .
+     +1: rjung, rpluem, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -156,21 +170,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) mod_ssl: Fix memory leak of OCSP stapling response.
-              The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
-              TLS response/handshake extension, so it must be freed.
-     trunk patch: http://svn.apache.org/r1874577
-     2.4.x patch: svn merge -c 1874577 ^/httpd/httpd/trunk .
-     +1: gbechis, rpluem
-
-  *) mod_ssl: Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
-              SSL_CTX_get_min_proto_version() and SSL_CTX_get_max_proto_version()
-              were only introduced in 1.1.0g.
-     trunk patch: http://svn.apache.org/r1875544
-     2.4.x patch: svn merge -c 1875544 ^/httpd/httpd/trunk .
-     +1: rjung, rpluem
-     -1: 
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]