From: Stefan Eissing <icing@apache.org>
Date: Tue, 10 Aug 2021 08:27:47 +0000 (+0000)
Subject: update after backport [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~42
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cb966e27a434ccb993a5a3df3a98f351558faffa;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@1892162 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index a0d0cd4cbd1..87103618179 100644
--- a/STATUS
+++ b/STATUS
@@ -232,33 +232,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              backport patch, maybe include r1887144 for completeness?
      jfclere: Yes: http://svn.apache.org/r1887144i was missing in trunk patch list.
 
-  *) back port the mapping=servlet proxy logic.
-     trunk patch: http://svn.apache.org/r1879074
-                  http://svn.apache.org/r1879075
-                  http://svn.apache.org/r1879076
-                  http://svn.apache.org/r1879077
-                  http://svn.apache.org/r1879078
-                  http://svn.apache.org/r1879079
-                  http://svn.apache.org/r1879080
-                  http://svn.apache.org/r1879094
-                  http://svn.apache.org/r1879095
-                  http://svn.apache.org/r1879110
-                  http://svn.apache.org/r1879111
-                  http://svn.apache.org/r1879112
-                  http://svn.apache.org/r1879114
-                  http://svn.apache.org/r1879116
-                  http://svn.apache.org/r1879117
-                  http://svn.apache.org/r1879137
-                  http://svn.apache.org/r1879144
-                  http://svn.apache.org/r1879145
-                  http://svn.apache.org/r1879147
-                  http://svn.apache.org/r1879149
-                  http://svn.apache.org/r1879235
-                  http://svn.apache.org/r1879360
-     Backport version for 2.4.x of patch:
-          https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/194.patch
-     +1: jfclere, ylavic, jim
-
   *) mod_proxy: Fix possible reuse/merging of Proxy(Pass)Match worker instances
      with others when their URLs contain a '$' substitution.  PR 65419 + 65429.
      trunk patch: http://svn.apache.org/r1891206