From: Joe Orton <jorton@apache.org>
Date: Thu, 13 Jun 2024 16:18:18 +0000 (+0000)
Subject: Propose x1.
X-Git-Tag: 2.4.60-rc1-candidate~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d2af216ceeac8be489366f2966bfca293220b7d;p=thirdparty%2Fapache%2Fhttpd.git

Propose x1.

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

diff --git a/STATUS b/STATUS
index 9a670a71dee..e30ba8a803a 100644
--- 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 ]