From: Jim Jagielski <jim@apache.org>
Date: Mon, 1 Jul 2019 15:37:49 +0000 (+0000)
Subject: And promote backport w/ at least 3 +1 votes
X-Git-Tag: 2.4.40~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=255841fad3c2ed84d95ff237f6d7692ab1a9765f;p=thirdparty%2Fapache%2Fhttpd.git

And promote backport w/ at least 3 +1 votes



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

diff --git a/STATUS b/STATUS
index 128b079f85b..f06337098dc 100644
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_dav: Reduce the amount of memory needed when doing PROPFIND's on large
+              collections by improving the memory management.
+              [Joe Orton, Ruediger Pluem]
+     trunk patch: http://svn.apache.org/r1842010
+                  http://svn.apache.org/r1841225
+                  http://svn.apache.org/r1862039
+                  http://svn.apache.org/r1862040
+                  http://svn.apache.org/r1862042
+     2.4.x patch: svn merge -c 1842010,1841225,1862039,1862040,1862042 ^/httpd/httpd/trunk .
+     +1: rpluem, jorton, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -158,17 +169,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              reworked, etc.. I would like to avoid a patch that is clearly wrong for some reviewer sitting here for
              months/years without any action item :)
 
-  *) mod_dav: Reduce the amount of memory needed when doing PROPFIND's on large
-              collections by improving the memory management.
-              [Joe Orton, Ruediger Pluem]
-     trunk patch: http://svn.apache.org/r1842010
-                  http://svn.apache.org/r1841225
-                  http://svn.apache.org/r1862039
-                  http://svn.apache.org/r1862040
-                  http://svn.apache.org/r1862042
-     2.4.x patch: svn merge -c 1842010,1841225,1862039,1862040,1862042 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, jim
-
   *) core: Split out the ability to parse wildcard files and directories
      from the Include/IncludeOptional directives into a generic set of
      functions ap_dir_nofnmatch() and ap_dir_fnmatch().