From 3ceea61373825eeff199f207f0909ee728c6e74e Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 1 Oct 2021 11:22:10 +0000 Subject: [PATCH] CHANGES and STATUS update after merge [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893776 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 6 ------ changes-entries/normalize_unreserved.txt | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 changes-entries/normalize_unreserved.txt diff --git a/CHANGES b/CHANGES index 61545257b34..5345cb1e26a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.50 + *) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in + the uri-path when it's preceded by a dot. [Yann Ylavic] + *) mod_md: when MDMessageCmd for a 'challenge-setup::' fails (!= 0 exit), the renewal process is aborted and an error is reported for the MDomain. This provides scripts that distribute diff --git a/STATUS b/STATUS index 825c0d3cbbe..164ff92f8ee 100644 --- a/STATUS +++ b/STATUS @@ -142,12 +142,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in - the uri-path when it's preceded by a dot. - trunk patch: http://svn.apache.org/r1893724 - 2.4.x patch: svn merge -c 1893724 ^/httpd/httpd/trunk . - +1: ylavic, covener, icing - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] 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 -- 2.47.2