From: Kaspar Brand <kbrand@apache.org>
Date: Mon, 6 Jan 2014 06:02:42 +0000 (+0000)
Subject: Backport r1421323, r1534754, r1546693, r1555464 from trunk:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17bacf44462c07bf7f00baa2cb6e17754f890abc;p=thirdparty%2Fapache%2Fhttpd.git

Backport r1421323, r1534754, r1546693, r1555464 from trunk:

Add support for OpenSSL configuration commands by introducing
the SSLOpenSSLConfCmd directive.

Proposed by: kbrand
Reviewed by: drh, trawick


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

diff --git a/CHANGES b/CHANGES
index 89935220f82..2696e00a99b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -206,8 +206,6 @@ Changes with Apache 2.5.0
   *) core: Correctly parse an IPv6 literal host specification in an absolute
      URL in the request line. [Stefan Fritsch]
 
-  *) mod_ssl: Add support for OpenSSL configuration commands [Stephen Henson]
-
   *) EventOpt MPM
 
   *) core: Add LogLevelOverride directive that allows to override the