promote

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

diff --git a/STATUS b/STATUS
index 3a759c4c8d6b78d1547d38320ef6465dbd6e9ae0..db9af6149771101ece3846937df2dcdd56d86889 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -147,10 +147,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
   *) dbm: Split the loading of a dbm driver from the opening of a dbm file. When
      an attempt to load a dbm driver fails, log clearly which driver triggered
      the error (not "default"), and what the error was.
@@ -162,6 +158,27 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: part of r1891023 is needed to fill some APLOGNO()
      icing: seems there is some potential to wrap this into a common function?
 
+  *) mod_proxy: Bump shared worker name to 384 chars. PR 53218
+     trunk patch: http://svn.apache.org/r1896253
+                  http://svn.apache.org/r1897859 (CHANGES entry, not in patch)
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/288.diff
+                  (PR: https://github.com/apache/httpd/pull/288)
+     ylavic: r1896253 made compatible with 2.4.x where we can't change the
+             layout/size of the existing proxy_worker_shared fields.
+     +1: ylavic, icing, jim
+
+  *) mod_http2: preserve the port number given in a HTTP/1.1
+     request that was Upgraded to HTTP/2. Fixes PR65881.
+     trunk patch: http://svn.apache.org/r1898146
+                  http://svn.apache.org/r1898173
+     2.4.x patch: svn merge -c 1898146,1898173 ^/httpd/httpd/trunk .
+     +1: icing, ylavic, jim
+
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
   *) Add the ldap-search option to mod_authnz_ldap, allowing authorization
      to be based on arbitrary expressions that do not include the username.
      Make sure that when ldap searches are too long, we explicitly log the
@@ -183,22 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
      +1: minfrin, jim,
 
-  *) mod_proxy: Bump shared worker name to 384 chars. PR 53218
-     trunk patch: http://svn.apache.org/r1896253
-                  http://svn.apache.org/r1897859 (CHANGES entry, not in patch)
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/288.diff
-                  (PR: https://github.com/apache/httpd/pull/288)
-     ylavic: r1896253 made compatible with 2.4.x where we can't change the
-             layout/size of the existing proxy_worker_shared fields.
-     +1: ylavic, icing, jim
-
-  *) mod_http2: preserve the port number given in a HTTP/1.1
-     request that was Upgraded to HTTP/2. Fixes PR65881.
-     trunk patch: http://svn.apache.org/r1898146
-                  http://svn.apache.org/r1898173
-     2.4.x patch: svn merge -c 1898146,1898173 ^/httpd/httpd/trunk .
-     +1: icing, ylavic, jim
-
   *) mod_http2: sync with trunk
      - Fixed an issue since 1.15.24 that "Server" headers in proxied requests
        were overwritten instead of preserved. [PR by @daum3ns]