From: Graham Leggett <minfrin@apache.org>
Date: Sat, 18 Nov 2023 11:33:06 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.59-rc1-candidate~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be6a1dc899463b2045179e8c4c6674a79697a65e;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index ca3ed677553..9eb1c50015a 100644
--- a/STATUS
+++ b/STATUS
@@ -153,6 +153,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Improve compatibility with OpenSSL 3, fix build warnings about
+     deprecated ENGINE_ API, honor OPENSSL_API_COMPAT setting while defaulting
+     to compatibitily with version 1.1.1 (including ENGINEs / SSLCryptoDevice).
+     mod_ssl: Disable the OpenSSL ENGINE API when OPENSSL_NO_ENGINE is set.
+     Allow for "SSLCryptoDevice builtin" if the ENGINE API is not available,
+     notably with OpenSSL >= 3.  PR 68080.
+     trunk patch: http://svn.apache.org/r1908537
+                  http://svn.apache.org/r1908539
+                  http://svn.apache.org/r1908542
+                  http://svn.apache.org/r1913616
+                  http://svn.apache.org/r1913815
+                  http://svn.apache.org/r1913816
+                  http://svn.apache.org/r1908542
+                  http://svn.apache.org/r1913832
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/381.diff
+                  (https://github.com/apache/httpd/pull/381)
+     +1: ylavic, jorton, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -188,24 +205,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              I'd suggest adding r1913838 here if both proposals can be merged
              at the same time..
 
-  *) mod_ssl: Improve compatibility with OpenSSL 3, fix build warnings about
-     deprecated ENGINE_ API, honor OPENSSL_API_COMPAT setting while defaulting
-     to compatibitily with version 1.1.1 (including ENGINEs / SSLCryptoDevice).
-     mod_ssl: Disable the OpenSSL ENGINE API when OPENSSL_NO_ENGINE is set.
-     Allow for "SSLCryptoDevice builtin" if the ENGINE API is not available,
-     notably with OpenSSL >= 3.  PR 68080.
-     trunk patch: http://svn.apache.org/r1908537
-                  http://svn.apache.org/r1908539
-                  http://svn.apache.org/r1908542
-                  http://svn.apache.org/r1913616
-                  http://svn.apache.org/r1913815
-                  http://svn.apache.org/r1913816
-                  http://svn.apache.org/r1908542
-                  http://svn.apache.org/r1913832
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/381.diff
-                  (https://github.com/apache/httpd/pull/381)
-     +1: ylavic, jorton
-
    *) mod_ldap: HTML-escape data in ldap-status handler
       trunk patch: http://svn.apache.org/r1913855
       2.4.x patch  svn merge -c 1913855 ^/httpd/httpd/trunk .