From: Joe Orton <jorton@apache.org>
Date: Tue, 1 Oct 2024 16:28:26 +0000 (+0000)
Subject: Update & reset mod_ssl vote.
X-Git-Tag: 2.4.63-candidate~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d91935cb82c47caeab63efd59296345945aa15;p=thirdparty%2Fapache%2Fhttpd.git

Update & reset mod_ssl vote.


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

diff --git a/STATUS b/STATUS
index 1917e473298..90004177500 100644
--- a/STATUS
+++ b/STATUS
@@ -214,8 +214,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_ssl: Fix regression in PKCS#11 handling which should work without
      SSLCryptoDevice configured
      trunk patch: https://svn.apache.org/r1920597
-     2.4.x patch: svn merge -c 1920597 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic,
+                  https://svn.apache.org/r1921076
+     2.4.x patch: svn merge -c 1920597 -c 1921076 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
   *) mod_rewrite, mod_proxy: mod_proxy to cononicalize rewritten [P] URLs,
      including "unix:" ones.  PR 69235, PR 69260, PR 56264