From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 22 May 2015 06:45:51 +0000 (+0000)
Subject: Edit for consistency between 2.4 and 2.2 CHANGES forks
X-Git-Tag: 2.2.30~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ff46236d9a1a2536db40115eb3267800c94905;p=thirdparty%2Fapache%2Fhttpd.git

Edit for consistency between 2.4 and 2.2 CHANGES forks

Submitted by: jim


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

diff --git a/CHANGES b/CHANGES
index 11268be62ed..a84c48fecca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,10 @@
 Changes with Apache 2.2.30
 
   *) In alignment with RFC 7525, the default recommended SSLCipherSuite
-     and SSLProxyCipherSuite now exclude RC4 as well as MD5.  Existing
-     configurations must be adjusted by the administrator. [William Rowe]
-
-  *) In alignment with RFC 7525, the default recommended SSLProtocol and
-     SSLProxyProtocol directives now excludes SSLv3.  Existing configurations 
-     must be adjusted by the administrator. [William Rowe]
+     and SSLProxyCipherSuite now exclude RC4 as well as MD5. Also, the
+     default recommended SSLProtocol and SSLProxyProtocol directives now
+     excludes SSLv3. Existing configurations must be adjusted by the
+     administrator. [William Rowe]
 
   *) core: Avoid potential use of uninitialized (NULL) request data in
      request line error path. [Yann Ylavic]