ChangeLog update

1 files changed, 35 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cd810983e6..e7c3ce0bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2009-05-24  Greg Beaver  <greg@chiaraquartet.net>
+
+    * (PHP_5_3)
+      NEWS
+      ext/phar/phar_object.c
+      ext/phar/tests/tar/phar_convert_phar4.phpt:
+      MFH: fix potential segfault when converting phars with metadata to other
+      formats, add test
+
+    * ext/phar/phar_object.c
+      ext/phar/tests/tar/phar_convert_phar4.phpt
+      ext/phar/tests/tar/phar_convert_phar4.phpt:
+      fix potential segfault when converting phars with metadata to other
+      formats, add test
+
+    * ext/phar/tests/tar/tar_nohash.phpt:
+      add missing test
+
+2009-05-24  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      ext/standard/file.c
+      ext/standard/http_fopen_wrapper.c
+      ext/standard/tests/file/fgetcsv_variation14.phpt
+      ext/standard/tests/file/fgetcsv_variation21.phpt:
+      
+      Improve fix for bug #48313
+
+    * (PHP_5_3)
+      ext/standard/file.c
+      ext/standard/tests/file/fgetcsv_variation14.phpt
+      ext/standard/tests/file/fgetcsv_variation21.phpt:
+      
+      MFB: Improve fix for bug #48313
+
 2009-05-23  Jani Taskinen  <jani.taskinen@sci.fi>
 
     * main/php_variables.c