From: Joe Orton <jorton@apache.org>
Date: Tue, 20 Feb 2024 10:54:48 +0000 (+0000)
Subject: Propose x1.
X-Git-Tag: 2.4.59-rc1-candidate~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5510d29fa38e61f8f3f9bb83893f8f132e10f761;p=thirdparty%2Fapache%2Fhttpd.git

Propose x1.

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

diff --git a/STATUS b/STATUS
index 47b9f19bca8..9036b69a6b3 100644
--- a/STATUS
+++ b/STATUS
@@ -231,6 +231,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Github PR: https://github.com/apache/httpd/pull/410
       +1: jorton, 
 
+   *) mod_ssl: follow-up to r1825120 to simplify code (no functional change)
+      trunk patch: https://svn.apache.org/r1825124
+      2.4.x patch: svn merge -c 1825124  ^/httpd/httpd/trunk .
+      Github PR: https://github.com/apache/httpd/pull/412
+      +1: jorton, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]