From: Kaspar Brand <kbrand@apache.org>
Date: Wed, 9 Apr 2014 09:48:34 +0000 (+0000)
Subject: add a few mod_ssl backport proposals
X-Git-Tag: 2.4.10~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fc3bbcfeb95367023e590ef7b262be5143939b1;p=apache

add a few mod_ssl backport proposals

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

diff --git a/STATUS b/STATUS
index 7d1b6350ad..ee39ab05bb 100644
--- a/STATUS
+++ b/STATUS
@@ -265,6 +265,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: trawick
 
+   * mod_ssl: bring SNI behavior into better conformance with RFC 6066
+     (also addresses PR 56241)
+     trunk patch: https://svn.apache.org/r1585090
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand
+
+   * mod_ssl: only read "active" values from the key_files array (PR 56306)
+     trunk patch: https://svn.apache.org/r1585918
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand
+
+   * mod_ssl: reverse the order when merging global and vhost-level config
+     arrays (PR 56353)
+     trunk patch: https://svn.apache.org/r1585919
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: