sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index 4f87b0982ef34685ea9efc247ac9d971859c3715..72bab12087e5d5ac4d756d83ea4f25cf680628c2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,6 @@ Changes with Apache 2.1.0-dev
   *) mod_deflate: Don't deflate responses with zero length 
      e.g. proxied 304's [Allan Edwards]
 
-  *) <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]
-
   *) <IfModule> now recognizes the module identifier in addition to the
      file name. PR 29003.  [Edward Rudd <eddie omegaware.com>, André Malo]
 
@@ -385,6 +381,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) <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]
+
   *) util_ldap: allow relative paths for LDAPTrustedCA to be resolved
      against ServerRoot PR#26602 [Brad Nicholes]