sync

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

diff --git a/CHANGES b/CHANGES
index da9b70cbc3b41f933d1bcc01dad7fbfff54d7a72..0d430eb170aa7af2db97b2443b00831b50d8d04e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -35,9 +35,6 @@ Changes with Apache 2.1.0-dev
      ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
      and ap_process_resource_config.  [André Malo]
 
-  *) htpasswd no longer refuses to process files that contain empty
-     lines.  [André Malo]
-
   *) Restore the ability to disable the use of AcceptEx on Win9x systems
      automatically. PR 28529.  [André Malo]
 
@@ -104,9 +101,6 @@ Changes with Apache 2.1.0-dev
   *) Allow RequestHeader directives to be conditional. PR 27951.
      [Vincent Deffontaines <vincent gryzor.com>, André Malo]
 
-  *) mod_logio no longer removes the EOS bucket. PR 27928.
-     [Bojan Smojver <bojan rexursive.com>]
-
   *) mod_rewrite no longer turns forward proxy requests into reverse proxy
      requests. PR 28125  [ast domdv.de, André Malo]
 
@@ -190,8 +184,8 @@ Changes with Apache 2.1.0-dev
   *) mod_dav: Disallow requests with an unescaped hash character in
      the Request-URI.  PR 21779.  [Amit Athavale <amit_athavale lycos.com>]
 
-  *) mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration attaches
-     a body to the 302 response and a wrong Content-Length header. 
+  *) mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration
+     attaches a body to the 302 response and a wrong Content-Length header.
      PR: 22951 [Ermanno Scaglione scaglione ..at.. starnetone.de]
 
   *) Bring ErrorHeader concept forward from 1.3, so that response
@@ -375,6 +369,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_logio no longer removes the EOS bucket. PR 27928.
+     [Bojan Smojver <bojan rexursive.com>]
+
+  *) htpasswd no longer refuses to process files that contain empty
+     lines.  [André Malo]
+
   *) Regression from 1.3: At startup, suexec now will be checked for
      availability, the setuid bit and user root. The works only if
      httpd is compiled with the shipped APR version (0.9.5).