Sync with 2.0.51-dev

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

diff --git a/CHANGES b/CHANGES
index 29cea60dcb103ecfd7aeafae9fbe47be3352e138..7fbc8c2b41945562b7afe58bc85969538fc106e6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -126,10 +126,6 @@ Changes with Apache 2.1.0-dev
   *) Added new module mod_version, which provides version dependent
      configuration containers.  [André Malo]
 
-  *) Accept URLs for the ServerAdmin directive. If the supplied
-     argument is not recognized as an URL, assume it's a mail address.
-     PR 28174.  [André Malo]
-
   *) mod_rewrite no longer confuses the RewriteMap caches if
      different maps defined in different virtual hosts use the
      same map name. PR 26462.  [André Malo]
@@ -155,10 +151,6 @@ Changes with Apache 2.1.0-dev
      Don't place script socket inside default server root instead of
      actual server root.  PR 27886.  [Jeff Trawick]
 
-  *) work around MSIE Digest auth bug - if AuthDigestEnableQueryStringHack
-     is set in r->subprocess_env allow mismatched query strings to pass.
-     PR 27758.  [Paul Querna <chip force-elite.com>, Geoffrey Young]
-
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 
@@ -413,6 +405,14 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) work around MSIE Digest auth bug - if AuthDigestEnableQueryStringHack
+     is set in r->subprocess_env allow mismatched query strings to pass.
+     PR 27758.  [Paul Querna, Geoffrey Young]
+
+  *) Accept URLs for the ServerAdmin directive. If the supplied
+     argument is not recognized as an URL, assume it's a mail address.
+     PR 28174.  [André Malo, Paul Querna]
+
   *) initialize server arrays prior to calling ap_setup_prelinked_modules
      so that static modules can push Defines values when registering
      hooks just like DSO modules can ["Philippe M. Chiasson" <gozer cpan.org>]