From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 5 Sep 2021 06:03:22 +0000 (+0000)
Subject: propose
X-Git-Tag: candidate-2.4.49-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ef9db4d9b4cdf633d518f36e31e57d928adffd;p=thirdparty%2Fapache%2Fhttpd.git

propose

[skip ci]

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

diff --git a/STATUS b/STATUS
index 72400cd8593..2292c2a7c71 100644
--- a/STATUS
+++ b/STATUS
@@ -186,6 +186,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
            PR: https://github.com/apache/httpd/pull/203
      +1: icing, minfrin
 
+  *) 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, 
+
+  *) 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, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]