From a0ec8c85e714fbd287e4189dee2a9978eb19e16c Mon Sep 17 00:00:00 2001
From: Paul Querna <pquerna@apache.org>
Date: Wed, 25 Nov 2009 22:35:45 +0000
Subject: [PATCH] sync to CHANGES to 2.3.4/2.3.5

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

diff --git a/CHANGES b/CHANGES
index 01c03c6401..9abae77f28 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,8 @@
                                                         -*- coding: utf-8 -*-
 
-Changes with Apache 2.3.3
+Changes with Apache 2.3.5
 
-  *) SECURITY: CVE-2009-3095 (cve.mitre.org)
-     mod_proxy_ftp: sanity check authn credentials.
-     [Stefan Fritsch <sf fritsch.de>, Joe Orton]
-
-  *) SECURITY: CVE-2009-3094 (cve.mitre.org)
-     mod_proxy_ftp: NULL pointer dereference on error paths.
-     [Stefan Fritsch <sf fritsch.de>, Joe Orton]
+Changes with Apache 2.3.4
 
   *) Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
      and WatchdogMutexPath with a single Mutex directive.  Add APIs to
@@ -29,7 +23,16 @@ Changes with Apache 2.3.3
 
   *) Build: fix --with-module to work as documented
      PR 43881 [Gez Saunders <gez.saunders virgin.net>]
-     
+
+Changes with Apache 2.3.3
+
+  *) SECURITY: CVE-2009-3095 (cve.mitre.org)
+     mod_proxy_ftp: sanity check authn credentials.
+     [Stefan Fritsch <sf fritsch.de>, Joe Orton]
+
+  *) SECURITY: CVE-2009-3094 (cve.mitre.org)
+     mod_proxy_ftp: NULL pointer dereference on error paths.
+     [Stefan Fritsch <sf fritsch.de>, Joe Orton]
   *) mod_ssl: enable support for ECC keys and ECDH ciphers.  Tested against
      OpenSSL 1.0.0b3.  [Vipul Gupta <vipul.gupta sun.com>, Sander Temme]
 
-- 
2.40.0