From: Joe Orton <jorton@apache.org>
Date: Thu, 16 Jul 2026 14:36:21 +0000 (+0000)
Subject: Merged x1.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76287d8e026eba13554aa35dc1d4c5b0ef6ece85;p=thirdparty%2Fapache%2Fhttpd.git

Merged x1.

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

diff --git a/STATUS b/STATUS
index dcf8ab02eb..9dc29515fa 100644
--- a/STATUS
+++ b/STATUS
@@ -163,14 +163,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) modules/md/mod_md_config.c: Flip MDServerStatus to
-     disabled by default. mod_md is CTR, but probably not
-     the change in default behavior. Needs an explicit
-     hint in CHANGES after applying it.
-     Backport has a conflict in docs, easy to fix.
-     trunk patch: https://svn.apache.org/r1935184
-     2.4.x patch: svn merge -c 1935184 ^/httpd/httpd/trunk .
-     +1: rjung, jim, jorton
 
 
 ------------------------------------------------------------------------