From: Stefan Eissing <icing@apache.org>
Date: Fri, 29 May 2020 10:25:14 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1410
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0669e593521dababd303b22874f96e25ada3811;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878268 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 161a9b442be..4156f5c0280 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
-  *) mod_proxy_http2: respect ProxyTimeout settings on backend connections
-     while waiting on incoming data. [Ruediger Pluem, Stefan Eissing]
-
   *) mod_proxy_fcgi: ProxyFCGISetEnvIf unsets variables when expression
      evaluates to false.  PR64365. [Michael König <mail ikoenig.net>]