]> granicus.if.org Git - apache/commitdiff
Propose.
authorYann Ylavic <ylavic@apache.org>
Thu, 14 May 2015 22:50:08 +0000 (22:50 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 14 May 2015 22:50:08 +0000 (22:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679472 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index d7acfa85e2d1a170c40f8469d9832a9920c68df5..b6a7360b4cabf48fa27a381677921eeb8d3f5920 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -270,7 +270,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1679428
                   http://svn.apache.org/r1679432 [CHANGES]
      2.4.x patch: trunk works (modulo CHANGES)
-     +1: wrowe
+     +1: wrowe, ylavic
+
+  *) 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
 
 OTHER PROPOSALS