From: Stefan Eissing <icing@apache.org>
Date: Wed, 23 Aug 2023 07:53:05 +0000 (+0000)
Subject: cleanup after merge
X-Git-Tag: 2.4.58-rc1-candidate~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8823bf0bff70ce4343edb420f757481e0c98777d;p=thirdparty%2Fapache%2Fhttpd.git

cleanup after merge


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

diff --git a/STATUS b/STATUS
index 21da609b95e..5d2f992b15e 100644
--- a/STATUS
+++ b/STATUS
@@ -162,15 +162,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
      +1: minfrin, covener, icing
 
-  *) mod_http2: fix access count reporting in server-status to not count
-     HTTP/2 requests twice. See PR 66801.
-     Trunk version of patch:
-        https://svn.apache.org/r1911291
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-       svn merge -c 1911291 ^/httpd/httpd/trunk .
-     +1: icing, gbechis
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]