From: Joe Orton <jorton@apache.org>
Date: Tue, 7 Sep 2021 06:43:24 +0000 (+0000)
Subject: Vote, promote, [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~3^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26ab9477e2ec9979045048170cb5bd3a07c28bf;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote, [skip ci]


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

diff --git a/STATUS b/STATUS
index 252af553378..81ccec2ffd0 100644
--- a/STATUS
+++ b/STATUS
@@ -141,6 +141,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Support logging private key material for use with
+     wireshark via log file given by SSLKEYLOGFILE environment
+     variable.  Requires OpenSSL 1.1.1.  PR 63391.
+     Trunk version of patch:
+        https://svn.apache.org/r1869842
+     Backport version for 2.4.x of patch:
+       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/264.diff
+     +1: rpluem, ylavic, jorton
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -175,15 +184,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      but I cannot find them commented. Further more the PR currently has merge
      conflicts.
 
-  *) mod_ssl: Support logging private key material for use with
-     wireshark via log file given by SSLKEYLOGFILE environment
-     variable.  Requires OpenSSL 1.1.1.  PR 63391.
-     Trunk version of patch:
-        https://svn.apache.org/r1869842
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/264.diff
-     +1: rpluem, ylavic
-
   *) mod_proxy: Sanity checks on the configured UDS path, fail with 500 if
      invalid since continuing through proxy processing wouldn't work as expected.
      Trunk version of patch: