From: Jim Jagielski <jim@apache.org>
Date: Mon, 18 May 2015 11:02:55 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.13~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=344c1b4adbc59a373ecb90d61c852f41f32e4173;p=apache

promote



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

diff --git a/STATUS b/STATUS
index b59b614d31..c874431a8b 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,26 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Propose a more modern Cipher and Protocol list, honor server cipher
+     priority and add explanations relative to RFC 7525 guidance.
+                  http://svn.apache.org/r1679428
+                  http://svn.apache.org/r1679432 [CHANGES]
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: wrowe, ylavic, jim
+
+  *) Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for
+     SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was
+     not yet included by default (follow up to merge r1542327 in 2.4.7).
+     trunk patch: http://svn.apache.org/r1679470
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, wrowe, jim
+
+  *) mod_dir: backport r1679620 which reverts r1675103. This change makes 
+     FallBackResource hijack requests that mod_autoindex might want to handle
+     later.
+     trunk patch: http://svn.apache.org/r1679620
+     2.4.x patch: trunk works
+     +1 covener, gsmith, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -272,27 +292,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) Propose a more modern Cipher and Protocol list, honor server cipher
-     priority and add explanations relative to RFC 7525 guidance.
-                  http://svn.apache.org/r1679428
-                  http://svn.apache.org/r1679432 [CHANGES]
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: wrowe, ylavic, jim
-
-  *) Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for
-     SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was
-     not yet included by default (follow up to merge r1542327 in 2.4.7).
-     trunk patch: http://svn.apache.org/r1679470
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, wrowe, jim
-
-  *) mod_dir: backport r1679620 which reverts r1675103. This change makes 
-     FallBackResource hijack requests that mod_autoindex might want to handle
-     later.
-     trunk patch: http://svn.apache.org/r1679620
-     2.4.x patch: trunk works
-     +1 covener, gsmith, jim
-
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: