From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 7 Feb 2019 22:23:27 +0000 (+0000)
Subject: Follow up to r1853133: CHANGES entry.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0362c2e2b3a33be56e8b239ba295114e3b98a277;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1853133: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853166 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index cb75679700c..80b3102ea8b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) 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. [Yann Ylavic]
+
   *) mod_http2: Configuration directoves H2Push and H2Upgrade can now be specified per 
      Location/Directory, e.g. disabling PUSH for a specific set of resources. [Stefan Eissing]