From: Joe Orton <jorton@apache.org>
Date: Tue, 8 Jul 2014 13:48:56 +0000 (+0000)
Subject: Ch-ch-changes for r1608759.
X-Git-Tag: 2.4.10~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a186514e53c61083dd1a7dc06fb2da99172d2939;p=apache

Ch-ch-changes for r1608759.

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

diff --git a/CHANGES b/CHANGES
index e9a5e3bfe4..f81753b136 100644
--- a/CHANGES
+++ b/CHANGES
@@ -79,6 +79,9 @@ Changes with Apache 2.4.10
      OCSP requests should use a nonce to be checked against the responder's
      one. PR 56233. [Yann Ylavic, Kaspar Brand]
 
+  *) mod_ssl: "SSLEngine off" will now override a Listen-based default
+     and does disable mod_ssl for the vhost.  [Joe Orton]
+
   *) mod_lua: Enforce the max post size allowed via r:parsebody()
      [Daniel Gruno]