From: Graham Leggett <minfrin@apache.org>
Date: Sun, 17 Jan 2021 17:03:23 +0000 (+0000)
Subject: Vote followed directly by a promote.
X-Git-Tag: 2.4.47~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f26ec7cf40891e76aabc7fd190a03a8969da32a;p=thirdparty%2Fapache%2Fhttpd.git

Vote followed directly by a promote.


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

diff --git a/STATUS b/STATUS
index de1b7c21d59..0cd3d62bc62 100644
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Easy patches: synch 2.4.x and trunk
+        - mod_dav: save a few cycles
+        - mod_{ssl,md}: init_stapling_status hooks should return an int
+        - util_md5: avoid temporary stack result in ap_md5_binary()
+        - mod_proxy_balancer: Add a missing </tr>
+        - mod_md: get_stapling_status hooks should return an int
+        - mod_session: Improve a message about SessionExpiryUpdateInterval values
+     trunk patch:
+          http://svn.apache.org/r1837388
+          http://svn.apache.org/r1876549
+          http://svn.apache.org/r1877551
+          http://svn.apache.org/r1882210
+          http://svn.apache.org/r1882399
+          http://svn.apache.org/r1883414
+     2.4.x patch: svn merge -c 1837388,1876549,1877551,1882210,1882399,1883414 ^/httpd/httpd/trunk .
+     +1: jailletc36, ylavic, minfrin
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -206,23 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1881303,1881304,1881305,1881306 ^/httpd/httpd/trunk .
      +1: jailletc36, minfrin
 
-  *) Easy patches: synch 2.4.x and trunk
-        - mod_dav: save a few cycles
-        - mod_{ssl,md}: init_stapling_status hooks should return an int
-        - util_md5: avoid temporary stack result in ap_md5_binary()
-        - mod_proxy_balancer: Add a missing </tr>
-        - mod_md: get_stapling_status hooks should return an int
-        - mod_session: Improve a message about SessionExpiryUpdateInterval values
-     trunk patch:
-          http://svn.apache.org/r1837388
-          http://svn.apache.org/r1876549
-          http://svn.apache.org/r1877551
-          http://svn.apache.org/r1882210
-          http://svn.apache.org/r1882399
-          http://svn.apache.org/r1883414
-     2.4.x patch: svn merge -c 1837388,1876549,1877551,1882210,1882399,1883414 ^/httpd/httpd/trunk . 
-     +1: jailletc36, ylavic
-
   *) Easy patches: synch 2.4.x and trunk
         - mod_http2: Fix ascii art
         - mod_http2: fix some dox comments