From: Jim Jagielski <jim@apache.org>
Date: Thu, 13 Mar 2014 13:43:28 +0000 (+0000)
Subject: backported
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9a6bb155ba16364b6bdf7b3241d965068c15a8c;p=thirdparty%2Fapache%2Fhttpd.git

backported


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

diff --git a/CHANGES b/CHANGES
index aed174bf2b0..a2de33e4f3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,11 +25,6 @@ Changes with Apache 2.5.0
   *) Add HttpContentLengthHeadZero and HttpExpectStrict directives.
      [Yehuda Sadeh <yehuda inktank com>, Justin Erenkrantz]
 
-  *) mod_ssl: Remove the hardcoded algorithm-type dependency for the
-     SSLCertificateFile and SSLCertificateKeyFile directives, to enable
-     future algorithm agility, and deprecate the SSLCertificateChainFile
-     directive (obsoleted by SSLCertificateFile). [Kaspar Brand]
-
   *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
      5+ instead of just for FreeBSD 5. PR 53824. [Jeff Trawick]