From: Eric Covener <covener@apache.org>
Date: Thu, 22 Jan 2015 15:45:29 +0000 (+0000)
Subject: sslprotocol fix
X-Git-Tag: 2.4.12~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb82235daf2fb9d976032123f5f3ed051ca3687a;p=thirdparty%2Fapache%2Fhttpd.git

sslprotocol fix


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

diff --git a/STATUS b/STATUS
index 03f8b7c2100..9bbb1ed1a6b 100644
--- a/STATUS
+++ b/STATUS
@@ -253,6 +253,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunks works
      +1: rjung, ylavic
 
+   * mod_ssl: Fix merge of SSLProtocol ALL in virtualhost context PR57100
+     trunk patch: http://svn.apache.org/r1653906
+     2.4.x patch: trunk works
+     +1 covener
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: