From: Stefan Eissing <icing@apache.org>
Date: Wed, 17 Nov 2021 08:43:25 +0000 (+0000)
Subject: update after backport [skip ci]
X-Git-Tag: candidate-2.4.52-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74354bca96185d4cd19a6866c47caf21b7121c7e;p=thirdparty%2Fapache%2Fhttpd.git

update after backport [skip ci]


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

diff --git a/CHANGES b/CHANGES
index 86dfa3b8c0e..8017b35a343 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.52
 
+  *) mod_proxy_uwsgi: Remove duplicate slashes at the beginning of PATH_INFO.
+     PR 65616.  [Ruediger Pluem]
+
 Changes with Apache 2.4.51
 
   *) SECURITY: CVE-2021-42013: Path Traversal and Remote Code
diff --git a/STATUS b/STATUS
index bf58b3a1f58..823a1954e18 100644
--- a/STATUS
+++ b/STATUS
@@ -144,12 +144,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_uwsgi: Remove duplicate slashes at the beginning of PATH_INFO.
-     PR 65616.
-     trunk patch: http://svn.apache.org/r1894074
-     2.4.x patch: svn merge -c 1894074 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/changes-entries/uwsgi-path_info.txt b/changes-entries/uwsgi-path_info.txt
deleted file mode 100644
index beb0a67434f..00000000000
--- a/changes-entries/uwsgi-path_info.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy_uwsgi: Remove duplicate slashes at the beginning of PATH_INFO.
-     PR 65616.  [Ruediger Pluem]