From: Stefan Eissing <icing@apache.org>
Date: Thu, 23 Sep 2021 12:29:51 +0000 (+0000)
Subject: update after backport [skip ci]
X-Git-Tag: candidate-2.4.50-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d64b52c2dc33e8a9fb19759185a58829553a4964;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@1893557 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index e819f6823b3..10ef20fcad2 100644
--- a/STATUS
+++ b/STATUS
@@ -150,14 +150,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                    http://people.apache.org/~covener/patches/speling-sync.diff
       +1 covener, rpluem, ylavic
 
-   *) mod_rewrite: Fix UDS ("unix:") scheme for [P] rules.  PR 57691 + 65590.
-      Trunk version of patch:
-         https://svn.apache.org/r1893516
-      Backport version for 2.4.x of patch:
-       Trunk version of patch works
-       svn merge -c 1893516 ^/httpd/httpd/trunk .
-      +1: rpluem, ylavic, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -189,7 +181,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1893532
      2.4.x patch: svn merge -c 1893519,1893532 ^/httpd/httpd/trunk .
      +1: ylavic, rpluem
-     ylavic: r1893532 applies after above r1893516 only
 
   *) mpm event: Correctly count active child processes in parent process if
      child process dies due to MaxConnectionsPerChild. PR 65592.