From: Stefan Eissing <icing@apache.org>
Date: Fri, 18 Feb 2022 09:32:26 +0000 (+0000)
Subject: updated backport proposal. [skip ci]
X-Git-Tag: 2.4.53-rc1-candidate~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0a4cc5f4cd38f0f1d05085e105a30066f82ead4;p=thirdparty%2Fapache%2Fhttpd.git

updated backport proposal. [skip ci]


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

diff --git a/STATUS b/STATUS
index 1ac72fba7e2..1ac8c2e2604 100644
--- a/STATUS
+++ b/STATUS
@@ -271,7 +271,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_http2: preserve the port number given in a HTTP/1.1
      request that was Upgraded to HTTP/2. Fixes PR65881.
      trunk patch: http://svn.apache.org/r1898146
-     2.4.x patch: svn merge -c 1898146 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1898173
+     2.4.x patch: svn merge -c 1898146,1898173 ^/httpd/httpd/trunk .
      +1: icing
      
   *) mod_http2: sync with trunk