From: Eric Covener <covener@apache.org>
Date: Sun, 19 Mar 2023 21:36:45 +0000 (+0000)
Subject: make update-changes
X-Git-Tag: 2.4.57-rc1-candidate~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eff0324d853d114dc2cc81b18e567f4f0105092f;p=thirdparty%2Fapache%2Fhttpd.git

make update-changes

[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908541 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a4a26fdb443..ce06f24e227 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.57
 
+  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
+     to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]
+
+  *) mod_mime: Do not match the extention against possible query string
+     parameters in case ProxyPass was used with the nocanon option.
+     [Ruediger Pluem]
+
 Changes with Apache 2.4.56
 
   *) SECURITY: CVE-2023-27522: Apache HTTP Server: mod_proxy_uwsgi
diff --git a/changes-entries/mapping_encode.txt b/changes-entries/mapping_encode.txt
deleted file mode 100644
index fc7e6e50086..00000000000
--- a/changes-entries/mapping_encode.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
-     to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]
diff --git a/changes-entries/mod_mime_nocanon.txt b/changes-entries/mod_mime_nocanon.txt
deleted file mode 100644
index 8ebf1a9b011..00000000000
--- a/changes-entries/mod_mime_nocanon.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-  *) mod_mime: Do not match the extention against possible query string
-     parameters in case ProxyPass was used with the nocanon option.
-     [Ruediger Pluem]