From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 May 2018 21:10:04 +0000 (+0000)
Subject: Backported in r1832487.
X-Git-Tag: 2.4.34~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec6ebeae0bd91399b0dd5b849b2a46aaa056d1d2;p=apache

Backported in r1832487.

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

diff --git a/STATUS b/STATUS
index ecb10dc13f..7dbb01e3e2 100644
--- a/STATUS
+++ b/STATUS
@@ -175,11 +175,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      Resetting votes after latest additions
      +1: icing, jim, ylavic
 
-  *) mod_http2: fix unnecessary timeout waits in case streams are aborted.
-     trunk patch: http://svn.apache.org/r1828879
-     2.4.x patch: svn merge -c 1828879 ^/httpd/httpd/trunk .
-     +1: icing, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]