From: Stefan Eissing <icing@apache.org>
Date: Thu, 18 Jul 2019 12:47:43 +0000 (+0000)
Subject: update proposal
X-Git-Tag: 2.4.40~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cacf55ff290debff939fac09e4ef4fce7c6625c;p=thirdparty%2Fapache%2Fhttpd.git

update proposal

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

diff --git a/STATUS b/STATUS
index b503263b2f6..7010ec2f149 100644
--- a/STATUS
+++ b/STATUS
@@ -202,13 +202,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) 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/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-v2.patch
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-keepalive+throttling-v3.patch
      +1: icing,
 
   *) mod_ssl: fix gcc 8+ warnings