From: Stefan Eissing <icing@apache.org>
Date: Fri, 2 Aug 2019 09:12:18 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.4.40~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d4c0402d8dd7778268871b268a888f9e4d9479;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

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

diff --git a/STATUS b/STATUS
index 1ce04369162..e178a0b8a5d 100644
--- a/STATUS
+++ b/STATUS
@@ -127,22 +127,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_http2: fixes Timeout vs. KeepAliveTimeout behaviour, see PR 63534. Fixes
-     stream cleanup when connection throttling is in place. Counts stream resets by client
-     on streams initiated by client as cause for connection throttling.
-     Changes in log level for header size checks by Michael Kaufmann. Added length
-     check on merged header values.
-     trunk patch:
-        http://svn.apache.org/r1861338
-        http://svn.apache.org/r1862475
-        http://svn.apache.org/r1862583
-        http://svn.apache.org/r1862865
-        http://svn.apache.org/r1863221
-        http://svn.apache.org/r1863276
-     2.4.x patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-keepalive+throttling-v3.patch
-     +1: icing, jim, rpluem
-
   *) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error
      when building in maintainer mode.
      trunk: