From: Joe Orton <jorton@apache.org>
Date: Fri, 2 Feb 2024 11:56:09 +0000 (+0000)
Subject: Done.
X-Git-Tag: 2.4.59-rc1-candidate~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee95ec1c02ff869c09e4ed4c631b6d08c0982598;p=thirdparty%2Fapache%2Fhttpd.git

Done.

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

diff --git a/STATUS b/STATUS
index 1b0c5e7162b..04f229285e7 100644
--- a/STATUS
+++ b/STATUS
@@ -187,20 +187,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: new proposal in https://github.com/apache/httpd/pull/396
      +1: jfclere
 
-  *) mod_ssl: fix LibreSSL build
-     Trunk version of patch:
-       https://svn.apache.org/r1874101
-       https://svn.apache.org/r1913838
-       svn merge -c 1874101,1913838 ^/httpd/httpd/trunk .
-     +1: ylavic, minfrin, jorton
-     ylavic: changes in ssl_private.h not needed if/after r1908537 is
-             backported (below proposal), though they are harmless. See:
-             https://lists.apache.org/thread/k924ql8c9ry1b9y94fpr2b0d5o6tmds6
-             I'd suggest adding r1913838 here if both proposals can be merged
-             at the same time..
-     minfrin: r1908537 is backported, can you update this proposal clean?
-     ylavic: done, votes reset
-
    *) Add CGIScriptTimeout to mod_cgi.
       trunk patch: http://svn.apache.org/r1828172
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch