You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2021/09/07 06:43:24 UTC

svn commit: r1893008 - /httpd/httpd/branches/2.4.x/STATUS

Author: jorton
Date: Tue Sep  7 06:43:24 2021
New Revision: 1893008

URL: http://svn.apache.org/viewvc?rev=1893008&view=rev
Log:
Vote, promote, [skip ci]

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1893008&r1=1893007&r2=1893008&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Sep  7 06:43:24 2021
@@ -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: