From 127b5891801e5016faeefd4ba346d5c13eb2c5b8 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 14 May 2015 22:50:08 +0000 Subject: [PATCH] Propose. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679472 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/STATUS b/STATUS index d7acfa85e2..b6a7360b4c 100644 --- 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 -- 2.40.0