* Vote and promote [skip ci]

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

diff --git a/STATUS b/STATUS
index 51f5d5d2cc0889ea8eda40810ba59e48d9c4061e..4dd28e1f3c9afbe37a554dd81d6a455040ff907b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -215,6 +215,35 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: Can someone test this on Windows too?
      steffenal: Tested on win32 and win64, looks all fine
 
+  *) Easy patches: synch 2.4.x and trunk
+         - mod_ssl: Fix a few warnings on 64 bits windows compilation
+         - ap_escape_quotes(): Remove unneeded checks to improve performance
+         - test/time-sem.c: unlock the accept mutex before exiting (error conditions)
+         - mod_ext_filter: Fix a spurious -1 used as a APR_SIZE_T_FMT in an error message
+         - mod_sed: fix some format string (s/lld/APR_INT64_T_FMT/)
+     trunk patch:
+          https://svn.apache.org/r1881379
+          https://svn.apache.org/r1892422
+          https://svn.apache.org/r1893011
+          https://svn.apache.org/r1897270
+          https://svn.apache.org/r1897271
+     2.4.x patch: svn merge -c 1881379,1892422,1893011,1897270,1897271 ^/httpd/httpd/trunk .
+     +1: jailletc36, icing, rpluem
+
+  *) APR and APU must be at least 1.3 to be able to configure and build httpd 2.4.x.
+     So remove some osbolete #if in the source code.
+        - mod_socache_memcache
+        - mod_authn_dbd
+        - mod_log_config
+        - mod_proxy_ftp and proxy-util
+     trunk patch:
+          https://svn.apache.org/r1897325
+          https://svn.apache.org/r1897326
+          https://svn.apache.org/r1897329
+          https://svn.apache.org/r1898255
+     2.4.x patch: svn merge -c 1897325,1897326,1897329,1898255 ^/httpd/httpd/trunk .
+     +1: jailletc36, icing, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -313,35 +342,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        PR: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/275.diff
      +1: icing,
 
-  *) Easy patches: synch 2.4.x and trunk
-         - mod_ssl: Fix a few warnings on 64 bits windows compilation
-         - ap_escape_quotes(): Remove unneeded checks to improve performance
-         - test/time-sem.c: unlock the accept mutex before exiting (error conditions)
-         - mod_ext_filter: Fix a spurious -1 used as a APR_SIZE_T_FMT in an error message
-         - mod_sed: fix some format string (s/lld/APR_INT64_T_FMT/)
-     trunk patch:
-          https://svn.apache.org/r1881379
-          https://svn.apache.org/r1892422
-          https://svn.apache.org/r1893011
-          https://svn.apache.org/r1897270
-          https://svn.apache.org/r1897271
-     2.4.x patch: svn merge -c 1881379,1892422,1893011,1897270,1897271 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing
-
-  *) APR and APU must be at least 1.3 to be able to configure and build httpd 2.4.x.
-     So remove some osbolete #if in the source code.
-        - mod_socache_memcache
-        - mod_authn_dbd
-        - mod_log_config
-        - mod_proxy_ftp and proxy-util
-     trunk patch:
-          https://svn.apache.org/r1897325
-          https://svn.apache.org/r1897326
-          https://svn.apache.org/r1897329
-          https://svn.apache.org/r1898255
-     2.4.x patch: svn merge -c 1897325,1897326,1897329,1898255 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing
-
   *) mod_proxy: Use the maxium of front end and backend timeouts instead of the
      minimum when tunneling requests (websockets, CONNECT requests).
      Backend timeouts can be configured more selectively (per worker if needed)