From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 6 Sep 2021 10:54:58 +0000 (+0000)
Subject: Backported [skip ci].
X-Git-Tag: candidate-2.4.49-rc1~3^2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab418d3d829963b5ae184328a6761a9aab56f14;p=thirdparty%2Fapache%2Fhttpd.git

Backported [skip ci].

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

diff --git a/STATUS b/STATUS
index 8293a15887c..08f686c3c99 100644
--- a/STATUS
+++ b/STATUS
@@ -141,18 +141,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_unique_id: Revert "mod_unique_id: Fix potential duplicated ID generation under
-     heavy load.   PR 65159" added in 2.4.47.  This causes issue on Windows.
-     trunk patch: http://svn.apache.org/r1892914
-     2.4.x patch: svn merge -c 1892914 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing, jorton
-
-  *) mod_unique_id: Reduce the time window where duplicates may be generated
-     PR 65159
-     trunk patch: http://svn.apache.org/r1892915
-     2.4.x patch: svn merge -c 1892915 ^/httpd/httpd/trunk .
-     +1: jailletc36, jorton, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]