Promote.

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

diff --git a/STATUS b/STATUS
index 3600d33a38956bf394b54c0358fb517562868c60..0d38f5606129a7d581269c009b582af2ffdbb954 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -122,6 +122,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: does not depend on r1572092 or r1572655 and al above,
              these proposals can be backported in any order.
 
+   * mod_ssl: Fix issue with redirects to error documents when handling
+     SNI errors.
+     trunk patch: http://svn.apache.org/r1609914
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
+   * mod_ssl: Set an error note for requests rejected due to
+     SSLStrictSNIVHostCheck
+     trunk patch: http://svn.apache.org/r1609936
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
+   * core: Include any error notes set by modules in the canned error
+     response for 403 errors.
+     trunk patch: http://svn.apache.org/r1609938
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -170,24 +188,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      note: depends on ap_shutdown_conn() from r1601185 above.
      +1: ylavic
 
-   * mod_ssl: Fix issue with redirects to error documents when handling
-     SNI errors.
-     trunk patch: http://svn.apache.org/r1609914
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
-   * mod_ssl: Set an error note for requests rejected due to
-     SSLStrictSNIVHostCheck
-     trunk patch: http://svn.apache.org/r1609936
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
-   * core: Include any error notes set by modules in the canned error
-     response for 403 errors.
-     trunk patch: http://svn.apache.org/r1609938
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
    * mod_proxy_ajp: Forward local IP address as a custom request attribute
      like we already do for the remote port.
      Both were forgotten in the original AJP 13 spec