From: Stefan Eissing <icing@apache.org>
Date: Wed, 20 Apr 2016 11:41:14 +0000 (+0000)
Subject: updated backport of h2 upgrade fix after fix
X-Git-Tag: 2.4.21~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca2c83805eed2db71002c6848110dd704cc450ae;p=thirdparty%2Fapache%2Fhttpd.git

updated backport of h2 upgrade fix after fix

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

diff --git a/STATUS b/STATUS
index b3bf7309b63..4b215c1c5a2 100644
--- a/STATUS
+++ b/STATUS
@@ -120,7 +120,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) Suppress 'h2' announcements in Upgrade: header as declared illegal by
      http-wg.
-     trunk patch: http://svn.apache.org/r1740075
+     trunk patches: http://svn.apache.org/r1740075
+                    http://svn.apache.org/r1740119
      2.4.x: trunk works modulo CHANGES
   +1: icing