From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 11 Nov 2005 22:31:32 +0000 (+0000)
Subject: * Sync with 2.2.x for backport r332657
X-Git-Tag: 2.3.0~2795
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ff0f1a79bb74948ed14b784e29780d6a2bc2aa4;p=thirdparty%2Fapache%2Fhttpd.git

* Sync with 2.2.x for backport r332657


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

diff --git a/CHANGES b/CHANGES
index 688a41f5e0b..3fb8876f7c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_dav: Fix a null pointer dereference in an error code path during the
-     handling of MKCOL.
-     [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
-
   *) Asynchronous write completion for the Event MPM.  [Brian Pane]
 
   *) Added an End-Of-Request bucket type.  The logging of a request and
@@ -37,6 +33,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.10
 
+  *) mod_dav: Fix a null pointer dereference in an error code path during the
+     handling of MKCOL.
+     [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
+
   *) Fix DESTDIR=... installation when using bundled copy of APR.
      [Torsten Foertsch <torsten.foertsch gmx.net>]