Changes committed - and set aside a placeholder for 2.1 patches.

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

diff --git a/CHANGES b/CHANGES
index 8c521175e22f864c1522f9bf666d2ab580ea289d..638c0e09d7b6177ec7f50cfb965d4c8adcc64af8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,20 @@
+Changes with Apache 2.1.0-dev
+
+  [Remove entries to the current 2.0 section below, when backported]
+
+
+
 Changes with Apache 2.0.44
 
+  *) mod_negotiation: Set the appropriate mime response headers
+     (Content-Type, charset, Content-Language and Content-Encoding)
+     for negotated type-map "Body:" responses (such as the error
+     pages.)  [André Malo <nd@perlig.de>]
+
+  *) mod_log_config: Allow '%%' escaping in CustomLog format
+     strings to insert a literal, single '%'.
+     [André Malo <nd@perlig.de>]
+
   *) Fix the building of cgi command lines when the query string
      contains '='.  PR 13914  [Ville Skyttä <ville.skytta@iki.fi>,
      Jeff Trawick]