From: Joe Orton <jorton@apache.org>
Date: Fri, 25 Aug 2023 07:52:31 +0000 (+0000)
Subject: Update and reset.
X-Git-Tag: 2.4.58-rc1-candidate~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0c8ce0661116eb8d4c9e30579ef6127b09fc62e;p=thirdparty%2Fapache%2Fhttpd.git

Update and reset.

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

diff --git a/STATUS b/STATUS
index 000718c1221..f831b841b71 100644
--- a/STATUS
+++ b/STATUS
@@ -225,11 +225,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) 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 ^/httpd/httpd/trunk .
+        svn merge -c 1911651,1911906 ^/httpd/httpd/trunk .
      2.4.x PR:
         https://github.com/apache/httpd/pull/377
-     +1: jorton, icing, 
+     +1: jorton,
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]