sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index 581b7185004d936ebc29adad5a773139ae17c3cb..6521725414e6fcde98adb804b9665fbe9f9a8fd5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -93,9 +93,6 @@ Changes with Apache 2.1.0-dev
      is set in r->subprocess_env allow mismatched query strings to pass.
      PR 27758.  [Paul Querna <chip force-elite.com>, Geoffrey Young]
 
-  *) mod_dav: Fix a problem that could cause crashes when manipulating 
-     locks on some platforms.  [Jeff Trawick]
-
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 
@@ -121,16 +118,9 @@ Changes with Apache 2.1.0-dev
      AUTH_GENERAL_ERROR.
      [Geoffrey Young]
 
-  *) mod_isapi: GetServerVariable returned improperly terminated header 
-     fields given "ALL_HTTP" or "ALL_RAW".  PR 20656.
-     [Jesse Pelton <jsp pkc.com>]
-
   *) mod_isapi: send_response_header() failed to copy status string's 
      last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]
 
-  *) mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
-     size.  PR 20617.  [Jesse Pelton <jsp pkc.com>]
-
   *) The whole codebase was relicensed and is now available under
      the Apache License, Version 2.0 (http://www.apache.org/licenses).
      [Apache Software Foundation]
@@ -363,6 +353,16 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_isapi: GetServerVariable returned improperly terminated header 
+     fields given "ALL_HTTP" or "ALL_RAW".  PR 20656.
+     [Jesse Pelton <jsp pkc.com>]
+
+  *) mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
+     size.  PR 20617.  [Jesse Pelton <jsp pkc.com>]
+
+  *) mod_dav: Fix a problem that could cause crashes when manipulating 
+     locks on some platforms.  [Jeff Trawick]
+
   *) mod_headers no longer crashes if an empty header value should
      be added.  [André Malo]