From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 9 Mar 2021 15:37:55 +0000 (+0000)
Subject: Promote [skip ci].
X-Git-Tag: 2.4.47~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef4723061ce67a8a8f80878d078196ce1be04b44;p=thirdparty%2Fapache%2Fhttpd.git

Promote [skip ci].

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

diff --git a/STATUS b/STATUS
index 7e94bf5a2fe..21f03f4f1bb 100644
--- a/STATUS
+++ b/STATUS
@@ -172,6 +172,28 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-etag2.patch
     +1: minfrin, jim, ylavic
 
+  *) mod_http2: explicitely apr_thread_exit() at the end of slot_run(), and
+                fix workers synchronization on pchild cleanup.
+     trunk patch: http://svn.apache.org/r1883668
+                  http://svn.apache.org/r1886255
+     2.4.x patch: svn merge -c 1883668,1886255 ^/httpd/httpd/trunk .
+     +1: ylavic, icing, jorton
+
+  *) mod_unique_id: Fix potential duplicated ID generation under heavy load.
+     PR 65159
+     trunk patch: http://svn.apache.org/r1887244
+                  http://svn.apache.org/r1887245
+     2.4.x patch: svn merge -c 1887244,1887245 ^/httpd/httpd/trunk .
+                  https://bz.apache.org/bugzilla/attachment.cgi?id=37749
+     +1: jailletc36, ylavic, jorton
+
+  *) mod_proxy_http: Fix a potential random memory corruption issue
+     PR 64234
+     trunk patch: https://svn.apache.org/r1875353
+     2.4.x patch: https://bz.apache.org/bugzilla/show_bug.cgi?id=64234#c2
+     +1: ylavic, jorton, jfclere
+     jailletc36: if applied on 2.4.x, a CHANGES entry should be added
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -183,14 +205,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: minfrin
     ylavic: patch is 404
 
-  *) mod_http2: explicitely apr_thread_exit() at the end of slot_run(), and
-                fix workers synchronization on pchild cleanup.
-     trunk patch: http://svn.apache.org/r1883668
-                  http://svn.apache.org/r1886255
-     2.4.x patch: svn merge -c 1883668,1886255 ^/httpd/httpd/trunk .
-     +1: ylavic, icing, jorton
-     ylavic: jorton's vote reset after adding r1886255
-
   *) mod_http2: sync with github standalone version 1.15.17
      - Log requests and sent the configured error response in case of early detected
        errors like too many or too long headers. [Ruediger Pluem]
@@ -211,22 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR: https://github.com/apache/httpd/pull/176
      +1: jorton, ylavic,
 
-  *) mod_unique_id: Fix potential duplicated ID generation under heavy load.
-     PR 65159
-     trunk patch: http://svn.apache.org/r1887244
-                  http://svn.apache.org/r1887245
-     2.4.x patch: svn merge -c 1887244,1887245 ^/httpd/httpd/trunk .
-                  https://bz.apache.org/bugzilla/attachment.cgi?id=37749
-     +1: jailletc36, ylavic, jorton
-
-  *) mod_proxy_http: Fix a potential random memory corruption issue
-     PR 64234
-     trunk patch: https://svn.apache.org/r1875353
-     2.4.x patch: https://bz.apache.org/bugzilla/show_bug.cgi?id=64234#c2
-     +1: ylavic, jorton, jfclere
-     jailletc36: if applied on 2.4.x, a CHANGES entry should be added
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]