From: Jim Jagielski <jim@apache.org>
Date: Mon, 20 Jun 2016 12:23:54 +0000 (+0000)
Subject: Backport and note non-release
X-Git-Tag: 2.4.22~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6785a3bd69e8f6e88f7107466e2db25aa7733321;p=thirdparty%2Fapache%2Fhttpd.git

Backport and note non-release


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

diff --git a/STATUS b/STATUS
index f4a0b032bba..71ac71fb7ea 100644
--- a/STATUS
+++ b/STATUS
@@ -35,7 +35,7 @@ Release history:
           while x.{even}.z versions are Stable/GA releases.]
 
     2.4.22  : In development.
-    2.4.21  : Tagged on June 16, 2016.
+    2.4.21  : Tagged on June 16, 2016, not released.
     2.4.20  : Tagged on April 4, 2016. Released on April 11, 2016.
     2.4.19  : Tagged on March 21, 2016, not released.
     2.4.18  : Tagged on December 8, 2015. Released on December 14, 2015.
@@ -146,6 +146,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: trunk patch works
      +1: elukey
 
+  *) mod_http2: fix for request abort when connections drops, introduced in 1.5.8
+     trunk patch: http://svn.apache.org/r1749151
+     2.4.x: trunk patch works
+     +1: jim
+
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if