]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Vote, promote [skip ci]
authorYann Ylavic <ylavic@apache.org>
Tue, 8 Feb 2022 10:50:31 +0000 (10:50 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 8 Feb 2022 10:50:31 +0000 (10:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1897856 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index da13f096b4c4a84d6804c5b6ca479086bb5cb08d..7e673366b3c966028d3d5837fbe6cf3d964a12a1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -179,6 +179,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
              Proposed for backport below, in place of or after this one.
      rpluem: +1 on PR 289 as well.
 
+  *) mod_dav: Fix regression when gathering properties which could lead to huge
+     memory consumption proportional to the number of resources.
+     Trunk version of patch:
+        https://svn.apache.org/r1897182
+        https://svn.apache.org/r1897614
+        https://svn.apache.org/r1897615
+        https://svn.apache.org/r1897619
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1897182,1897614,1897615,1897619 ^/httpd/httpd/trunk .
+     +1: rpluem, jorton, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -225,18 +237,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
      +1: minfrin
 
-  *) mod_dav: Fix regression when gathering properties which could lead to huge
-     memory consumption proportional to the number of resources.
-     Trunk version of patch:
-        https://svn.apache.org/r1897182
-        https://svn.apache.org/r1897614
-        https://svn.apache.org/r1897615
-        https://svn.apache.org/r1897619
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1897182,1897614,1897615,1897619 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton
-
   *) Support PCRE2 with buffers reuse through Thread Local Storage.
      trunk patches:
          http://svn.apache.org/r1897240