From: Joe Orton <jorton@apache.org>
Date: Mon, 6 Sep 2021 08:08:53 +0000 (+0000)
Subject: Votes. [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fc5877390d0a9c0f9e552e08df0d165d73944af;p=thirdparty%2Fapache%2Fhttpd.git

Votes. [skip ci]


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

diff --git a/STATUS b/STATUS
index 0b65ecfe2c6..118b49bd774 100644
--- a/STATUS
+++ b/STATUS
@@ -146,7 +146,7 @@ RELEASE SHOWSTOPPERS:
                   http://svn.apache.org/r1892851
      2.4.x patch: svn merge -c 1892740,1892851 ^/httpd/httpd/trunk .
                 + http://home.apache.org/~ylavic/patches/2.4.x-proxy_http_tunnel_name.patch
-     +1: ylavic, covener
+     +1: ylavic, covener, jorton
      ylavic: 2.4.x-proxy_http_tunnel_name.patch is about logging the upgraded
              protocol (instead of "HTTP") in the tunneling loop traces, to help
              debugging. This is the case already in trunk since r1879419, but
@@ -155,6 +155,12 @@ 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
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -186,22 +192,16 @@ 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, icing
-
   *) 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, 
+     +1: jailletc36, jorton
 
   *) mpm_prefork: mask signals during ap_run_child_init()
      trunk patch: http://svn.apache.org/r1890465
      2.4.x patch: svn merge -c 1890465 ^/httpd/httpd/trunk .
-     +1: jailletc36, 
+     +1: jailletc36, jorton
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]