Resync CHANGES with 2.2.x branch point.

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

diff --git a/CHANGES b/CHANGES
index 81d92e1ce1338f80b0548ef24a3203ecd5720698..cd90736f2f2c2e9a88c876ccb55eb063d00cd82d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.3.0
+  [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+Changes with Apache 2.1.7
   *) SECURITY: CAN-2005-2491 (cve.mitre.org): 
      Fix integer overflows in PCRE in quantifier parsing which could
      be triggered by a local user through use of a carefully-crafted 
@@ -37,9 +39,6 @@ Changes with Apache 2.3.0
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
      [Martin Kraemer, David Reid]
 
-Changes with Apache 2.1.7
-  [Remove entries to the current 2.0 section below, when backported]
-
   *) mod_cache: Restore the HTTP status of cached responses.
      [Hansjoerg Pehofer <hansjoerg.pehofer uibk.ac.at>]