From: Eric Covener <covener@apache.org>
Date: Fri, 6 Mar 2020 01:08:44 +0000 (+0000)
Subject: promote [skip ci]
X-Git-Tag: 2.4.42~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4190c4c4b40046238af8e46608c53d55ea521698;p=thirdparty%2Fapache%2Fhttpd.git

promote [skip ci]


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

diff --git a/STATUS b/STATUS
index 002208c4623..94d1f7bf8b7 100644
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1874323 ^/httpd/httpd/trunk .
      +1: ylavic, gsmith, rpluem
 
+  *) usertrack: allow cookie flags samesite/secure/httponly to be configured
+     trunk patch: http://svn.apache.org/r1874389
+     2.4.x patch: svn merge -c 1874389 ^/httpd/httpd/trunk .
+     +:1 covener
+     jailletc36: 1874480 and 1874601 are needed to avoid the duplication of 
+                the "CookieTracking" directive in 'command_rec'.
+     ylavic: +1 with 1874480,1874601
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -176,14 +185,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) usertrack: allow cookie flags samesite/secure/httponly to be configured
-     trunk patch: http://svn.apache.org/r1874389
-     2.4.x patch: svn merge -c 1874389 ^/httpd/httpd/trunk .
-     +:1 covener
-     jailletc36: 1874480 and 1874601 are needed to avoid the duplication of 
-                the "CookieTracking" directive in 'command_rec'.
-     ylavic: +1 with 1874480,1874601
-
   *) authz_groupfile: drop severity of AH0166 (user not found in groupfile)
      from ERR to INFO.
      trunk patch: http://svn.apache.org/r1874424