From: Stefan Eissing <icing@apache.org>
Date: Wed, 10 Jul 2019 10:51:40 +0000 (+0000)
Subject: updated http2 backport proposal
X-Git-Tag: 2.4.40~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26d349f4e692d3409f413b38caa5bc6f43e6b4ef;p=thirdparty%2Fapache%2Fhttpd.git

updated http2 backport proposal

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

diff --git a/STATUS b/STATUS
index 5fbbf9be432..3020c83a8c8 100644
--- a/STATUS
+++ b/STATUS
@@ -209,12 +209,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk .
      +1: jfclere, icing
 
-  *) mod_http2: fixes Timeout vs. KeepAliveTimeout behaviour, see PR 63534.
+  *) 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.
      trunk patch:
+        http://svn.apache.org/r1861338
         http://svn.apache.org/r1862475
         http://svn.apache.org/r1862583
+        http://svn.apache.org/r1862865        
      2.4.x patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-keepalive-yann-v4.patch
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-keepalive+throttling-v2.patch
      +1: icing,
 
   *) mod_ssl: fix gcc 8+ warnings