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 4efece7f3c093753d895a69321450a090ca52159..b2a3660b2585b7a8056fc3e413f48eebf01a0e8f 100644 (file)
--- 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 (file)
index cda5eeb..0000000
--- 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 (file)
index 4782967..0000000
--- 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 (file)
index 30e3984..0000000
--- 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