From: Stefan Eissing <icing@apache.org>
Date: Fri, 29 May 2020 12:41:34 +0000 (+0000)
Subject: revert r1878268
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0879a7ad9a5e1fb9d8b370a2001c555130dfd72;p=thirdparty%2Fapache%2Fhttpd.git

revert r1878268

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

diff --git a/CHANGES b/CHANGES
index 4156f5c0280..161a9b442be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- 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>]