From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 7 Feb 2019 22:27:11 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.39~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69e959f9dd0caba0e9cd6b5db110e2cd48a14116;p=thirdparty%2Fapache%2Fhttpd.git

Propose.

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

diff --git a/STATUS b/STATUS
index c4f193f8ae6..bf38774dcec 100644
--- a/STATUS
+++ b/STATUS
@@ -209,6 +209,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1850745 ^/httpd/httpd/trunk .
      +1: jim
 
+  *) mod_ssl: Don't unset FIPS mode on restart unless it's forced by
+     configuration (SSLFIPS on) and not active by default in OpenSSL. PR 63136.
+     trunk patch: http://svn.apache.org/r1853133
+                  http://svn.apache.org/r1853166
+     2.4.x patch: svn merge -c 1853133,1853166 ^/httpd/httpd/trunk .
+                  (trunk works, modulo CHANGES)
+     +1: ylavic
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED