From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 22 Feb 2024 13:45:08 +0000 (+0000)
Subject: Accepted.
X-Git-Tag: 2.4.59-rc1-candidate~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a4d6d659ef4212b7b6b49a60a3dc4da63fb0f91;p=thirdparty%2Fapache%2Fhttpd.git

Accepted.

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

diff --git a/STATUS b/STATUS
index cfd251a8c78..97d73858d96 100644
--- a/STATUS
+++ b/STATUS
@@ -165,6 +165,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
       +1 from me on the backport.
 
+   *) 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, ylavic, jfclere
+
+   *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
+      trunk patch: https://svn.apache.org/r1915889
+      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
+      Github PR: https://github.com/apache/httpd/pull/413
+      +1: ylavic, jorton, jfclere
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -231,18 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Github PR: https://github.com/apache/httpd/pull/410
       +1: jorton, ylavic,
 
-   *) 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, ylavic, jfclere
-
-   *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
-      trunk patch: https://svn.apache.org/r1915889
-      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
-      Github PR: https://github.com/apache/httpd/pull/413
-      +1: ylavic, jorton, jfclere
-
    *) htpasswd: Windows : do not include ap_config_auto.h 
       trunk patch: https://svn.apache.org/r1877693 
       2.4.x patch: svn merge -c 1877693 ^/httpd/httpd/trunk .