From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 7 Oct 2021 12:41:24 +0000 (+0000)
Subject: Sync CHANGES [skip ci].
X-Git-Tag: 2.5.0-alpha2-ci-test-only~761
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=476b41695c714cc8f394631afeb185c5d6dd9f76;p=thirdparty%2Fapache%2Fhttpd.git

Sync CHANGES [skip ci].

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

diff --git a/CHANGES b/CHANGES
index 4efece7f3c0..b2a3660b258 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: Add ap_unescape_url_ex() for better decoding control, and deprecate
+     unused AP_NORMALIZE_DROP_PARAMETERS flag.
+     [Yann Ylavic, Ruediger Pluem, Stefan Eissing, Joe Orton]
+
+  *) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in
+     the uri-path when it's preceded by a dot.  [Yann Ylavic]
+
+  *) mod_proxy: New tunnel_forward hooking mechanism allowing modules to handle
+     Upgrade(d) protocols data.  [Yann Ylavic]
+
   *) mod_dav: Correctly handle errors returned by dav providers on REPORT
      requests. [Ruediger Pluem]
 
diff --git a/changes-entries/ap_unescape_url_ex.txt b/changes-entries/ap_unescape_url_ex.txt
deleted file mode 100644
index cda5eebea18..00000000000
--- a/changes-entries/ap_unescape_url_ex.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) core: Add ap_unescape_url_ex() for better decoding control, and deprecate
-     unused AP_NORMALIZE_DROP_PARAMETERS flag.
-     [Yann Ylavic, Ruediger Pluem, Stefan Eissing, Joe Orton]
\ No newline at end of file
diff --git a/changes-entries/normalize_unreserved.txt b/changes-entries/normalize_unreserved.txt
deleted file mode 100644
index 4782967a656..00000000000
--- a/changes-entries/normalize_unreserved.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in
-     the uri-path when it's preceded by a dot.  [Yann Ylavic]
\ No newline at end of file
diff --git a/changes-entries/tunnel_forward_hook.txt b/changes-entries/tunnel_forward_hook.txt
deleted file mode 100644
index 30e39847d23..00000000000
--- a/changes-entries/tunnel_forward_hook.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: New tunnel_forward hooking mechanism allowing modules to handle
-     Upgrade(d) protocols data.  [Yann Ylavic]
\ No newline at end of file