From 75f014cd9f413a0f5c18cd0d44a500ec2d8c5d21 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Sun, 10 May 2009 01:32:59 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e63a34bfd4..6ec4f8dc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,90 @@
+2009-05-09  Johannes Schlüter  <johannes@schlueters.de>
+
+    * (PHP_5_3)
+      ext/standard/CREDITS:
+      really delete it
+
+    * ext/standard/CREDITS
+      ext/standard/credits_ext.h:
+      Remove bad CREDITS file
+
+2009-05-09  Etienne Kneuss  <php@colder.ch>
+
+    * (PHP_5_3)
+      NEWS
+      ext/spl/spl_directory.c
+      ext/spl/tests/bug47534.phpt:
+      MFH: Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring
+      CURRENT_AS_PATHNAME)
+
+    * ext/spl/spl_directory.c
+      ext/spl/tests/bug47534.phpt
+      ext/spl/tests/bug47534.phpt:
+      Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring
+      CURRENT_AS_PATHNAME)
+
+    * ext/spl/tests/bug47534.phpt
+      ext/spl/tests/bug47534.phpt:
+      
+      file bug47534.phpt was initially added on branch PHP_5_2.
+
+2009-05-09  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_2)
+      NEWS
+      NEWS:
+      BFN
+
+2009-05-09  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_5_3)
+      NEWS:
+      - Moved to PHP_5_2
+
+2009-05-09  Scott MacVicar  <scott@macvicar.net>
+
+    * ext/fileinfo/libmagic/patchlevel.h
+      ext/fileinfo/libmagic/readcdf.c:
+      Update bundled libmagic to 5.03
+
+2009-05-09  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_5_2)
+      NEWS
+      acinclude.m4:
+      MFH: sync + - Fixed bug #47468 (enable cli|cgi-only extensions  for embed
+      sapi)
+
+    * (PHP_5_3)
+      acinclude.m4:
+      MFH:- Fixed bug #47468 (enable cli|cgi-only extensions  for embed sapi)
+
+    * acinclude.m4:
+      - Fixed bug #47468 (enable cli|cgi-only extensions  for embed sapi)
+
+2009-05-09  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      ext/spl/tests/dit_003.phpt:
+      MFH Broken test when you have a snapshot as it relies on CVS
+
+    * ext/spl/tests/dit_003.phpt:
+      Broken test when you have a snapshot as it relies on CVS
+
+    * (PHP_5_2)
+      ext/spl/spl_iterators.c
+      ext/spl/spl_iterators.c:
+      MFH Fix bug #48206 - Iterating over an invalid data structure leads to a
+      segfault
+
+    * ext/spl/spl_iterators.c
+      ext/spl/spl_iterators.c:
+      Fix bug #48206 again
+
+    * ext/spl/spl_iterators.c:
+      Fix bug #48206 - Iterating over an invalid data structure leads to a
+      segfault
+
 2009-05-08  Matt Wilmas  <php_lists@realplain.com>
 
     * (PHP_5_2)
-- 
2.40.0