From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 8 Mar 2017 12:31:31 +0000 (+0000)
Subject: Propose for backport
X-Git-Tag: 2.4.26~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=388b508c1a73b0c2cbcc467f3cb21a8207c7ae72;p=apache

Propose for backport

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

diff --git a/STATUS b/STATUS
index 6a5cd6382b..4ea81f55e0 100644
--- 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 ]