Vote, then promote.

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

diff --git a/STATUS b/STATUS
index 5ff61beda81b75ebb31c576271a719d1f10ae297..e49dcb7ae720acfa6b7de64aabee3a729473cf7a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,32 @@ 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_http2: Fix ascii art
+        - mod_http2: fix some dox comments
+        - mod_dav: Don't call memcpy(,NULL,0)
+        - mod_ssl: Pass base_server in OpenSSL init log message
+        - .gdbinit: tab to space
+        - mod_so: don't try to load modules from a NULL path
+        - mod_cache_file/mod_lua: Add missing "const" or "static const" qualifiers
+                                  in some command_rec definitions
+        - mod_lua: Fix compilation error if APR_HAS_THREADS is not defined
+        - core/log: fix an harmless warning spoted by gcc 10
+        - mod_ssl: update comment
+     trunk patch:
+          http://svn.apache.org/r1810233
+          http://svn.apache.org/r1827530
+          http://svn.apache.org/r1874144
+          http://svn.apache.org/r1877262
+          http://svn.apache.org/r1878263
+          http://svn.apache.org/r1880461
+          http://svn.apache.org/r1882053
+          http://svn.apache.org/r1882060
+          http://svn.apache.org/r1883452
+          http://svn.apache.org/r1884551
+     2.4.x patch: svn merge -c 1810233,1827530,1874144,1877262,1878263,1880461,1882053,1882060,1883452,1884551 ^/httpd/httpd/trunk .
+     +1: jailletc36, jorton, minfrin
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -206,32 +232,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_http2: Fix ascii art
-        - mod_http2: fix some dox comments
-        - mod_dav: Don't call memcpy(,NULL,0)
-        - mod_ssl: Pass base_server in OpenSSL init log message 
-        - .gdbinit: tab to space
-        - mod_so: don't try to load modules from a NULL path
-        - mod_cache_file/mod_lua: Add missing "const" or "static const" qualifiers
-                                  in some command_rec definitions
-        - mod_lua: Fix compilation error if APR_HAS_THREADS is not defined
-        - core/log: fix an harmless warning spoted by gcc 10
-        - mod_ssl: update comment
-     trunk patch:
-          http://svn.apache.org/r1810233
-          http://svn.apache.org/r1827530
-          http://svn.apache.org/r1874144
-          http://svn.apache.org/r1877262
-          http://svn.apache.org/r1878263
-          http://svn.apache.org/r1880461
-          http://svn.apache.org/r1882053
-          http://svn.apache.org/r1882060
-          http://svn.apache.org/r1883452
-          http://svn.apache.org/r1884551
-     2.4.x patch: svn merge -c 1810233,1827530,1874144,1877262,1878263,1880461,1882053,1882060,1883452,1884551 ^/httpd/httpd/trunk .
-     +1: jailletc36, jorton, 
-
   *) Synch 2.4.x and trunk
          When ap_cstr_casecmp[n] have been introduced, in r1747469, it has introduced
          many differences between 2.4.x and trunk.