From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 18 Jan 2021 16:52:04 +0000 (+0000)
Subject: Update CHANGES entries [skip ci].
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1047
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db52c628a343b37c8b3a5870934857c93a31e20;p=thirdparty%2Fapache%2Fhttpd.git

Update CHANGES entries [skip ci].

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

diff --git a/CHANGES b/CHANGES
index 7992e42f19f..e84753ff4d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_xml2enc: Update check to match MIME types matching
+     "+xml" rather than anything containing "xml", avoiding
+     corruption of Microsoft OOXML formats.  PR 64339.
+     [Joseph Heenan <joseph.heenan fintechlabs.io>]
+
+  *) mod_proxy_wstunnel: Leave Upgrade requests handling to mod_proxy_http,
+     allowing for (non-)Upgrade negotiation with the origin server.
+     [Yann Ylavic]
+
+  *) mod_ssl: SSLProxyMachineCertificateFile/Path may reference files
+     which include CA certificates; those CA certs are treated as if
+     configured with SSLProxyMachineCertificateChainFile.  [Joe Orton]
+
   *) mpm_event: don't reset connections after lingering close, restoring prior
      to 2.4.28 behaviour.  [Yann Ylavic]
 
diff --git a/changes-entries/pr64339.txt b/changes-entries/pr64339.txt
deleted file mode 100644
index 7037bd8c5cd..00000000000
--- a/changes-entries/pr64339.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mod_xml2enc: Update check to match MIME types matching
-     "+xml" rather than anything containing "xml", avoiding
-     corruption of Microsoft OOXML formats.  PR 64339.
-     [Joseph Heenan <joseph.heenan fintechlabs.io>]
diff --git a/changes-entries/proxy_wstunnel_to_http.txt b/changes-entries/proxy_wstunnel_to_http.txt
deleted file mode 100644
index b2068afab5f..00000000000
--- a/changes-entries/proxy_wstunnel_to_http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mod_proxy_wstunnel: Leave Upgrade requests handling to mod_proxy_http,
-     allowing for (non-)Upgrade negotiation with the origin server.
-     [Yann Ylavic]
-
diff --git a/changes-entries/ssl-proxy-chain-certs.txt b/changes-entries/ssl-proxy-chain-certs.txt
deleted file mode 100644
index 244a24c5d0c..00000000000
--- a/changes-entries/ssl-proxy-chain-certs.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mod_ssl: SSLProxyMachineCertificateFile/Path may reference files
-     which include CA certificates; those CA certs are treated as if
-     configured with SSLProxyMachineCertificateChainFile.  [Joe Orton]
-