Updates with backported changes.

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

diff --git a/CHANGES b/CHANGES
index b5e694dff58ac5c1ee6c09717aeb75bb34770f44..d271af4e1f61189603726048f862917f2b004665 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Fix for mod_dav.  Call the 'can_be_activity' callback, if provided,
-     when a MKACTIVITY request comes in.
-     [Ben Collins-Sussman <sussman@apache.org>]
-
   *) Prevent the server from crashing when entering infinite loops. The
      new LimitInternalRecursion directive configures limits of subsequent
      internal redirects and nested subrequests, after which the request
@@ -142,6 +138,16 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Fix for mod_dav.  Call the 'can_be_activity' callback, if provided,
+     when a MKACTIVITY request comes in.
+     [Ben Collins-Sussman <sussman@collab.net>]
+
+  *) Perform run-time query in apxs for apr and apr-util's includes.
+     [Justin Erenkrantz]
+
+  *) run libtool from the apr install directory (in case that is different
+     from the apache install directory) [Jeff Trawick]
+
   *) configure.in: Play nice with libtool-1.5. [Wilfredo Sanchez]
 
   *) If mod_mime_magic does not know the content-type, do not attempt to