]> granicus.if.org Git - apache/commitdiff
showstopper
authorJim Jagielski <jim@apache.org>
Mon, 3 Apr 2017 11:39:53 +0000 (11:39 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 3 Apr 2017 11:39:53 +0000 (11:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789972 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index c2559b87e1a6aa4c20a924621d0a2e95e40c5a23..a7fa743985bdadee8bd0e432e2e15102ddd5f2ea 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,27 +115,6 @@ CURRENT RELEASE NOTES:
 
 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 ]
-
-  *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
-     allowing per backend TLS configuration.
-     trunk patch: http://svn.apache.org/r1740928
-                  http://svn.apache.org/r1740960
-                  http://svn.apache.org/r1740967
-                  http://svn.apache.org/r1740987
-                  http://svn.apache.org/r1740998
-                  http://svn.apache.org/r1742697
-                  http://svn.apache.org/r1756976
-                  http://svn.apache.org/r1781313
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v3.patch
-     +1: ylavic
-
-
   *) mod_proxy_hcheck: Honor checks in Vhosts
      trunk patch: http://svn.apache.org/r1784203
                   http://svn.apache.org/r1784205
@@ -156,6 +135,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              default value (as expected).
      jim: Committed in r1789387
 
+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 ]
+
+  *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
+     allowing per backend TLS configuration.
+     trunk patch: http://svn.apache.org/r1740928
+                  http://svn.apache.org/r1740960
+                  http://svn.apache.org/r1740967
+                  http://svn.apache.org/r1740987
+                  http://svn.apache.org/r1740998
+                  http://svn.apache.org/r1742697
+                  http://svn.apache.org/r1756976
+                  http://svn.apache.org/r1781313
+     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v3.patch
+     +1: ylavic
+
   *) mod_remoteip: Add PROXY protocol support
      trunk patch: http://svn.apache.org/r1776575
                   http://svn.apache.org/r1776578 (doc fix)