]> granicus.if.org Git - apache/commitdiff
add a few mod_ssl backport proposals
authorKaspar Brand <kbrand@apache.org>
Wed, 9 Apr 2014 09:48:34 +0000 (09:48 +0000)
committerKaspar Brand <kbrand@apache.org>
Wed, 9 Apr 2014 09:48:34 +0000 (09:48 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1585922 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 7d1b6350ad00ec89c7650ad1311eea11839f442f..ee39ab05bbbaaec5b9ae676addd25d68e48f0b89 100644 (file)
--- 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: