Merged x2, Vote+Promote x1.

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

diff --git a/STATUS b/STATUS
index f9a2bcd3f0301a00963189c393cfa84a3951d92f..4425067262a86cf74f2d4b979167b48106a33881 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -199,13 +199,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      backport needs adjusting MMN
      +1: icing, rpluem, jorton
 
-  *) mod_lua: Fix memory handling in output filter
-     Trunk version of patch:
-        https://svn.apache.org/r1924095
-     Backport version for 2.4.x of patch:
-        svn merge -c 1924095 ^/httpd/httpd/trunk .
-     +1: jorton, rpluem, covener
-
   *) mod_ssl: Remove warning over potential uninitialised value
      for ssl protocol prior to protocol selection.
      Trunk version of patch:
@@ -214,13 +207,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ssl-prot-fix.patch
      +1: minfrin, rpluem, covener
 
-  *) mod_dav: Add dav_get_base_path() API.
-     Trunk version of patch:
-        https://svn.apache.org/1923639
-     Backport version for 2.4.x of patch:
-        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/526.patch
-     +1: jorton, rpluem, covener
-
   *) mod_md: update to v2.5.2
      Trunk version of patch:
         https://svn.apache.org/r1925979
@@ -228,6 +214,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         svn merge -c 1925979 ^/httpd/httpd/trunk .
      +1: icing, rpluem, covener
 
+  *) mod_headers: don't call ap_set_content_type() when manipulating
+     _request_ headers.
+     Trunk version of patch:
+        https://svn.apache.org/r1820750
+     Backport version for 2.4.x of patch:
+        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/533.diff
+     +1 covener, rpluem, jorton
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -255,14 +248,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         svn merge -c 1925975 ^/httpd/httpd/trunk .
      +1: icing, rpluem
 
-  *) mod_headers: don't call ap_set_content_type() when manipulating
-     _request_ headers.
-     Trunk version of patch:
-        https://svn.apache.org/r1820750
-     Backport version for 2.4.x of patch:
-        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/533.diff
-     +1 covener, rpluem
-
   *) mod_proxy_balancer: Fix a regression that caused stickysession keys no
      longer be recognized if they are provided as query parameter in the URL.
      PR 69443