From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 12 Apr 2015 07:52:22 +0000 (+0000)
Subject: Add CHANGES entry before backport proposal
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ed9ca880cddbcd2323a0cab75d1b0eed604496c;p=thirdparty%2Fapache%2Fhttpd.git

Add CHANGES entry before backport proposal

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

diff --git a/CHANGES b/CHANGES
index 9ca4cccf7ff..7ca5e397a39 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol
+     will override other parameters given in the same directive. This could be
+     a missing + or - prefix.  PR 52820 [Christophe Jaillet]
+
   *) core: Make sure to also print VirtualHost log messages of level
      "warn" or higher at configuration parsing time. [Kaspar Brand]