* Vote, promote, comment

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

diff --git a/STATUS b/STATUS
index fb4554d1072cbe6774ecb54b1127b12f319bf3de..a0cbf8334c6b2749173635fb2addf6ce795548b0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -168,6 +168,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1916925,1916926,1916929 ^/httpd/httpd/trunk .
     +1: rjung, ylavic, jorton
 
+  *) mod_ssl: add OpenSSL STORE based PKCS#11 support, and fix
+     crashes in ENGINE-based PKCS#11 with OpenSSL 3.2
+     trunk patch: https://svn.apache.org/r1914365
+                  https://svn.apache.org/r1914622
+                  https://svn.apache.org/r1916057
+                  https://svn.apache.org/r1918024
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/455.diff
+     PR: https://github.com/apache/httpd/pull/455
+     +1: jorton, ylavic, rpluem
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -212,16 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1916004  ^/httpd/httpd/trunk .
       +1: jfclere,
 
-  *) mod_ssl: add OpenSSL STORE based PKCS#11 support, and fix
-     crashes in ENGINE-based PKCS#11 with OpenSSL 3.2
-     trunk patch: https://svn.apache.org/r1914365
-                  https://svn.apache.org/r1914622
-                  https://svn.apache.org/r1916057
-                  https://svn.apache.org/r1918024
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/455.diff
-     PR: https://github.com/apache/httpd/pull/455
-     +1: jorton, ylavic,
-
   *) mod_http2: sync with github module. Add async handling
      on newer httpd for blocked connections, fix yield handling.
      Trunk version of patch:
@@ -239,6 +240,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/449.diff
     PR: https://github.com/apache/httpd/pull/449
     +1: ylavic, icing, 
+    rpluem says: PR currently has merge conflicts that need to be resolved
 
   *) mod_proxy: Backport for PRs 69160 and 69168
      Trunk version of patch: