]> granicus.if.org Git - apache/commitdiff
Propose for backport
authorWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 8 Mar 2017 12:31:31 +0000 (12:31 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 8 Mar 2017 12:31:31 +0000 (12:31 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785953 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 6a5cd6382b2e8c0bed72fe6b3261cde1a952808a..4ea81f55e0a00ffda44c87944e93feaa54aeec02 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -201,6 +201,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
      +1: jim
 
+  *) Support OpenSSL 1.1.0
+     Apply trunk -> 2.4.x merge branch with the command;
+       svn merge https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat
+     +1: wrowe
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]