sync

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

diff --git a/CHANGES b/CHANGES
index 72bab12087e5d5ac4d756d83ea4f25cf680628c2..643b77eaa6fa75af85a5c6d37c6bf3da793b14fa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -53,13 +53,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]
 
-  *) Restore the ability to disable the use of AcceptEx on Win9x systems
-     automatically. PR 28529.  [André Malo]
-
-  *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
-     exported on Win32 as well.  PR 28523.
-     [Edward Rudd <eddie omegaware.com>, André Malo]
-
   *) Include directives no longer refuse to process symlinks on
      directories. Instead there's now a maximum nesting level
      of included directories (128 as distributed). This is configurable
@@ -113,9 +106,6 @@ Changes with Apache 2.1.0-dev
      status and terminate the provider chain prior to checking the password.
      [Geoffrey Young]
 
-  *) mod_rewrite no longer turns forward proxy requests into reverse proxy
-     requests. PR 28125  [ast domdv.de, André Malo]
-
   *) mod_rewrite now officially supports RewriteRules in <Proxy> sections.
      PR 27985.  [André Malo]
 
@@ -381,6 +371,16 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_rewrite no longer turns forward proxy requests into reverse proxy
+     requests. PR 28125  [ast domdv.de, André Malo]
+
+  *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
+     exported on Win32 and Netware as well (minor MMN bump).  PR 28523.
+     [Edward Rudd <eddie omegaware.com>, André Malo]
+
+  *) Restore the ability to disable the use of AcceptEx on Win9x systems
+     automatically (broken in2.0.49). PR 28529.  [André Malo]
+
   *) <VirtualHost myhost> now applies to all IP addresses for myhost
      instead of just the first one reported by the resolver.  This
      corrects a regression since 1.3.  [Jeff Trawick]