From: Jim Jagielski <jim@apache.org>
Date: Fri, 6 Mar 2020 16:12:06 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.42~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c1e341fd4e789463590401f28be475b1138ff06;p=thirdparty%2Fapache%2Fhttpd.git

promote



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

diff --git a/STATUS b/STATUS
index 718e18d2f34..0fe458e7669 100644
--- a/STATUS
+++ b/STATUS
@@ -146,6 +146,23 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1874323 ^/httpd/httpd/trunk .
      +1: ylavic, gsmith, rpluem
 
+  *) authz_groupfile: drop severity of AH0166 (user not found in groupfile)
+     from ERR to INFO.
+     trunk patch: http://svn.apache.org/r1874424
+     2.4.x patch: svn merge -c 1874424 ^/httpd/httpd/trunk .
+     +:1 covener, ylavic, jim
+
+  *) mod_proxy_hcheck: Allow %{Content-Type} to work in expressions
+     trunk patch: http://svn.apache.org/r1874616
+     2.4.x patch:  svn merge -c 1874616 ^/httpd/httpd/trunk .
+     +1: covener, ylavic, jim
+
+  *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
+     identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
+     trunk patch: http://svn.apache.org/r1874689
+     2.4.x patch: svn merge -c 1874689 ^/httpd/httpd/trunk .
+     +1: icing, ylavic, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -168,23 +185,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) authz_groupfile: drop severity of AH0166 (user not found in groupfile)
-     from ERR to INFO.
-     trunk patch: http://svn.apache.org/r1874424
-     2.4.x patch: svn merge -c 1874424 ^/httpd/httpd/trunk .
-     +:1 covener, ylavic, jim
-
-  *) mod_proxy_hcheck: Allow %{Content-Type} to work in expressions
-     trunk patch: http://svn.apache.org/r1874616
-     2.4.x patch:  svn merge -c 1874616 ^/httpd/httpd/trunk .
-     +1: covener, ylavic, jim
-
-  *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
-     identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
-     trunk patch: http://svn.apache.org/r1874689
-     2.4.x patch: svn merge -c 1874689 ^/httpd/httpd/trunk .
-     +1: icing, ylavic, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]