reflect a couple of items merged into 2.2.1-dev

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

diff --git a/CHANGES b/CHANGES
index 1bbfd55bf3ee727786efcb0bdad91d3ccc6fd528..6f5c3c6f75fca18dbd52aa14d93a039909f27123 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,11 +18,6 @@ Changes with Apache 2.3.0
      invalidate it.  Warn when input filter can invalidate it.
      [Jeff Trawick]
 
-  *) Ensure that the proper status line is written to the client, fixing
-     incorrect status lines caused by filters which modify r->status without 
-     resetting r->status_line, such as the built-in byterange filter.
-     [Jeff Trawick]
-
   *) mod_ssl: Fix spurious hostname mismatch warning for valid
      wildcard certificates.  PR 37911.  [Nick Burch <nick torchbox.com>]
 
@@ -40,8 +35,6 @@ Changes with Apache 2.3.0
      respect the configured status of uninitilized workers when creating a new
      child process. [Ruediger Pluem]
 
-  *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]
-
   *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
      PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>]
 
@@ -121,6 +114,13 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.1
 
+  *) Ensure that the proper status line is written to the client, fixing
+     incorrect status lines caused by filters which modify r->status without 
+     resetting r->status_line, such as the built-in byterange filter.
+     [Jeff Trawick]
+
+  *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]
+
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)
      mod_ssl: Fix a possible crash during access control checks if a
      non-SSL request is processed for an SSL vhost (such as the