From: Joe Orton <jorton@apache.org>
Date: Mon, 4 Sep 2023 12:01:12 +0000 (+0000)
Subject: Merged x1.
X-Git-Tag: 2.4.58-rc1-candidate~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1581f4c7ad02bdd5b1cbc4db04f9f678b672c6f7;p=thirdparty%2Fapache%2Fhttpd.git

Merged x1.

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

diff --git a/STATUS b/STATUS
index ccf39d94aa0..11efaf01e77 100644
--- a/STATUS
+++ b/STATUS
@@ -152,16 +152,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_dav: add DavBasePath (PR 35077)
-     Trunk version of patch:
-        https://svn.apache.org/r1911651
-        https://svn.apache.org/r1911906
-     Backport version for 2.4.x of patch:
-        svn merge -c 1911651,1911906 ^/httpd/httpd/trunk .
-     2.4.x PR:
-        https://github.com/apache/httpd/pull/377
-     +1: jorton, minfrin, rpluem
-
   *) mod_alias: Add AliasPreservePath directive to map the full path after the
      alias in a location. Requires r1861542 / r1861569 above.
      Trunk version of patch: