From 5905e3ddec88fe0f79b882f88bc48a45a6d2689b Mon Sep 17 00:00:00 2001
From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 12 Apr 2015 07:52:22 +0000
Subject: [PATCH] Add CHANGES entry before backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672989 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9ca4cccf7f..7ca5e397a3 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]
 
-- 
2.40.0