]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Vote and promote [skip ci]
authorRuediger Pluem <rpluem@apache.org>
Mon, 14 Oct 2024 06:52:14 +0000 (06:52 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 14 Oct 2024 06:52:14 +0000 (06:52 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1921298 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index ab647490ad269e15484be692c051868c50279da0..a6474ce1afd38eaff7915d40daa4c1b887a8790a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -177,6 +177,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      Can be applied via apply_backport_pr.sh 484
      +1: rpluem, ylavic, covener
 
+  *) mod_ssl: Fix regression in PKCS#11 handling which should work without
+     SSLCryptoDevice configured
+     trunk patch: https://svn.apache.org/r1920597
+                  https://svn.apache.org/r1921076
+     2.4.x patch: svn merge -c 1920597 -c 1921076 ^/httpd/httpd/trunk .
+     +1: jorton, ylavic, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -218,13 +224,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ivan
      +0: jorton - falls under RTC exception for "non-Unix build" 
 
-  *) mod_ssl: Fix regression in PKCS#11 handling which should work without
-     SSLCryptoDevice configured
-     trunk patch: https://svn.apache.org/r1920597
-                  https://svn.apache.org/r1921076
-     2.4.x patch: svn merge -c 1920597 -c 1921076 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic,
-
   *) mod_proxy_fcgi: Fix proxy-fcgi-pathinfo=full
      trunk patch: https://svn.apache.org/r1919547
                   https://svn.apache.org/r1921238