]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update after backport
authorStefan Eissing <icing@apache.org>
Fri, 29 May 2020 10:24:36 +0000 (10:24 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 29 May 2020 10:24:36 +0000 (10:24 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878267 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1caf973a6f010767daf9c8a8bbd1f7d072839d91..743c19942b5216439a93ac4d2c5194775974c89b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -214,13 +214,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  One is a doc file in r1734835 that has already been merged and the
                  other one is 'next-number' in r1876823.
  
-  *) mod_proxy_http2: respect ProxyTimeout settings on backend connections
-     while waiting on incoming data.
-     trunk patch:
-          http://svn.apache.org/r1878233
-     2.4.x patch: svn merge -c 1878233 ^/httpd/httpd/trunk . 
-     +1: icing 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]