promote

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

diff --git a/STATUS b/STATUS
index 976c3d271cc3ff04d3689f07815ec0af3089d6f8..227fb5cbc0055106e81a87c3adf1d437687c97f6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -100,6 +100,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
+   * mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.
+                This may happen when ProxyPreserveHost is on and the proxy-worker
+                handles connections to different Hosts.
+     trunk patch: http://svn.apache.org/r1572630
+                  http://svn.apache.org/r1572611 (MMN minor bump)
+                  http://svn.apache.org/r1572967
+                  http://svn.apache.org/r1573229
+     2.4.x patch: trunk works (modulo MMN)
+     +1: ylavic, rpluem, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -137,16 +147,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://people.apache.org/~jim/patches/uds-rewrite.patch
      +1: jim, humbedooh
 
-   * mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.
-                This may happen when ProxyPreserveHost is on and the proxy-worker
-                handles connections to different Hosts.
-     trunk patch: http://svn.apache.org/r1572630
-                  http://svn.apache.org/r1572611 (MMN minor bump)
-                  http://svn.apache.org/r1572967
-                  http://svn.apache.org/r1573229
-     2.4.x patch: trunk works (modulo MMN)
-     +1: ylavic, rpluem, jim
-
    * mod_deflate: Fix decompression of files larger than 4GB. According to RFC1952,
                   Input SIZE contains the size of the original input data modulo 2^32.
                   PR 56062.