Author: trawick
Date: Fri Oct  2 12:53:17 2009
New Revision: 820994

URL: http://svn.apache.org/viewvc?rev=820994&view=rev
Log:
APR trunk/2.0 includes APR-Util

  note the merge as a change
  point to prior APR-Util CHANGES files too
  axe a couple of included APR-Util fixes from the 2.0 change log

Modified:
    apr/apr/trunk/CHANGES

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=820994&r1=820993&r2=820994&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Fri Oct  2 12:53:17 2009
@@ -23,13 +23,6 @@
   *) Fix race conditions in initialisation of DBD, DBM and DSO.
      [Bojan Smojver]
 
-  *) SECURITY: CVE-2009-0023 (cve.mitre.org)
-     Fix underflow in apr_strmatch_precompile.
-     [Matthew Palmer <mpalmer debian.org>]
-
-  *) Fix off by one overflow in apr_brigade_vprintf.
-     [C. Michael Pilato <cmpilato collab.net>]
-
   *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
      [Jochen Voss (no e-mail)]
 
@@ -46,27 +39,34 @@
      Currently only implemented for shm, proc and global mutexes on posix
      platforms.  [Mladen Turk]
 
+  *) Merge APR-Util into APR.  [various]
 
-Changes for APR 1.4.x and later:
+Changes for APR and APR-Util 1.4.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?view=markup
 
-Changes for APR 1.3.x and later:
+Changes for APR and APR-Util 1.3.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?view=markup
 
-Changes for APR 1.2.x and later:
+Changes for APR and APR-Util 1.2.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?view=markup
 
-Changes for APR 1.1.x and later:
+Changes for APR and APR-Util 1.1.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.1.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.1.x/CHANGES?view=markup
 
-Changes for APR 1.0.x and later:
+Changes for APR and APR-Util 1.0.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.0.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.0.x/CHANGES?view=markup
 
-Changes for APR 0.9.x and later/earlier:
+Changes for APR and APR-Util 0.9.x and later/earlier:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/CHANGES?view=markup
+  *) http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/CHANGES?view=markup