From ee62004041b06486c140be65301d698ba82d5b14 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 8 Sep 2021 08:42:05 +0000 Subject: [PATCH] Sync CHANGES for r1893111. [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893118 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ changes-entries/proxy_nocanon_interpolate.txt | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 changes-entries/proxy_nocanon_interpolate.txt diff --git a/CHANGES b/CHANGES index 988df145ab1..a52c2e7317d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.49 + *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and + "ProxyPassInterpolateEnv On" are configured. PR 65549. + [Joel Self ] + *) mpm_event: Fix children processes possibly not stopped on graceful restart. PR 63169. [Joel Self ] diff --git a/changes-entries/proxy_nocanon_interpolate.txt b/changes-entries/proxy_nocanon_interpolate.txt deleted file mode 100644 index a2b033cbbf0..00000000000 --- a/changes-entries/proxy_nocanon_interpolate.txt +++ /dev/null @@ -1,3 +0,0 @@ - *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and - "ProxyPassInterpolateEnv On" are configured. PR 65549. - [Joel Self ] \ No newline at end of file -- 2.47.2