sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index 2578afcb63b318701e7ef5d6d0cab31ab83171bc..64bc17821626dedeecb93f28d987cd3268122b7f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
+
   *) Fix segfault in mod_mem_cache cache_insert() due to cache size
      becoming negative.  PR: 21285, 21287
      [Bill Stoddard, Massimo Torquati, Jean-Jacques Clar]
@@ -255,6 +256,13 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Add AP_MPMQ_MPM_STATE function code for ap_mpm_query. (Not yet
+     supported for BeOS, OS/2, or Win32 MPMs.)  [Jeff Trawick,
+     Brad Nicholes]
+
+  *) Add mod_status hook to allow modules to add to the mod_status
+     report.  [Joe Orton]
+
   *) Fix htdbm to generate comment fields in DBM files correctly.
      [Justin Erenkrantz]