From: Stefan Eissing <icing@apache.org>
Date: Fri, 5 Jul 2019 07:27:41 +0000 (+0000)
Subject: vote
X-Git-Tag: 2.4.40~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b916470c64b1780f9f4c297cfeb398ba468b121;p=thirdparty%2Fapache%2Fhttpd.git

vote

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

diff --git a/STATUS b/STATUS
index fc0472a9cd2..bebd61b3915 100644
--- a/STATUS
+++ b/STATUS
@@ -158,6 +158,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1426802,1744460,1829799,1824716,1838318,1840678,1861294 ^/httpd/httpd/trunk . 
      +1: jailletc36, jim, icing
 
+  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
+                    an URL that contains a :port.
+                    PR 53915 [Rein Tollevik <rein basefarm.no>]
+     trunk: http://svn.apache.org/r1851146
+     2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk .
+     +1: jailletc36, jim, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -204,13 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1857859 ^/httpd/httpd/trunk .
      +1: jailletc36, icing
 
-  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
-                    an URL that contains a :port.
-                    PR 53915 [Rein Tollevik <rein basefarm.no>]
-     trunk: http://svn.apache.org/r1851146
-     2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk .
-     +1: jailletc36, jim
-
   *) mod_socache_shmcb: fix gcc 9 warnings
      trunk: http://svn.apache.org/r1858565
      2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk .