]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose x1.
authorJoe Orton <jorton@apache.org>
Thu, 13 Jun 2024 16:18:18 +0000 (16:18 +0000)
committerJoe Orton <jorton@apache.org>
Thu, 13 Jun 2024 16:18:18 +0000 (16:18 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918299 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 9a670a71deebc241b176094ae9bcafa6deacdebe..e30ba8a803a489f3435a49ced420d2b690d2cc87 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -264,6 +264,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         svn merge -c 1918003 ^/httpd/httpd/trunk .
       +1: icing,
 
+   *) mod_ssl: use SSL_OP_NO_RENEGOTIATION to block client-initiated
+      renogotiation at OpenSSL level
+      Trunk version of patch:
+         https://svn.apache.org/r1877397
+         https://svn.apache.org/r1877795
+      2.4.x version of patch:
+         https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/426.patch
+      PR: https://github.com/apache/httpd/pull/426
+      +1: jorton,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]