From: Joe Orton <jorton@apache.org>
Date: Fri, 21 May 2021 11:18:33 +0000 (+0000)
Subject: Vote*1, propose*1, TBD*1. [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e1bfacc3561b4cbc2eea591759a0eec69146dff;p=thirdparty%2Fapache%2Fhttpd.git

Vote*1, propose*1, TBD*1. [skip ci]


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

diff --git a/STATUS b/STATUS
index bb954b6a715..d3ac8093e8f 100644
--- a/STATUS
+++ b/STATUS
@@ -164,14 +164,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
- *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
-    dav_get_resource() to mod_dav.h.
-    trunk patch: http://svn.apache.org/r1879305
-                 http://svn.apache.org/r1879466
-    2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
-    +1: minfrin
-    ylavic: patch is 404
-
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
      2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .
@@ -189,11 +181,27 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
       Trunk version of patch works
       svn merge -c 1889806 ^/httpd/httpd/trunk .
-     +1: rpluem,
+     +1: rpluem, jorton,
+
+  *) htcacheclean: Fix help output and error message.
+     Trunk version of patch:
+        https://svn.apache.org/r1864784
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1864784 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
+ *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
+    dav_get_resource() to mod_dav.h.
+    trunk patch: http://svn.apache.org/r1879305
+                 http://svn.apache.org/r1879466
+    2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
+    +1: minfrin
+    ylavic: patch is 404
+
   *) mod_dav: Allow other modules to become providers and add ACLs
      to the DAV response.
      trunk patch: http://svn.apache.org/r1748322