From 838ab371d97220a6cc2b753a0d9d07c32916f5d0 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Tue, 25 Jan 2005 01:34:05 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 14 ++++++++++
 2 files changed, 85 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8d4d5335dad..a955a4b27df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2005-01-24  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      main/rfc1867.c
+      main/rfc1867.c:
+      MFH: Use multibyte specific code for handling files and generic basename
+      based code in all other instances.
+
+    * main/rfc1867.c:
+      Use multibyte specific code for handling files and generic basename based
+      code in all other instances.
+
+    * (PHP_5_0)
+      ext/sysvmsg/sysvmsg.c:
+      Fixed compiler warning.
+
+2005-01-24  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * (PHP_5_0)
+      NEWS
+      NEWS:
+      - BFN
+
+    * (PHP_5_0)
+      NEWS:
+      - MFH fix for bug #31348 CachingIterator::rewind() leaks
+
+    * ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h
+      ZendEngine2/tests/bug30725.phpt:
+      - Second and last part of #30725 fix
+
+    * ZendEngine2/zend_interfaces.c:
+      - Allow getIterator() to fail
+
+    * ZendEngine2/tests/bug30725.phpt:
+      
+      - Add new test
+
+    * NEWS:
+      - mysqli/sqlite changes
+
+    * ext/sqlite/sqlite.c:
+      - Synch with MYSQLi extension and use RuntimeException as base for
+        SQLiteException if SPL is present.
+
+2005-01-24  Moriyoshi Koizumi  <moriyoshi@at.wakwak.com>
+
+    * main/rfc1867.c:
+      - Revert irrelevant part.
+
+2005-01-24  Antony Dovgal  <tony2001@phpclub.net>
+
+    * ext/sysvmsg/tests/002.phpt:
+        1.1.4;
+      add test
+
+    * ext/sysvmsg/sysvmsg.c:
+      fix msg_recieve() returning TRUE instead of FALSE when unserialize failed
+      (patch by Andrey Hristov)
+
+2005-01-24  Joe Orton  <jorton@redhat.com>
+
+    * (PHP_4_3)
+      sapi/apache2handler/php_functions.c
+      sapi/apache2handler/php_functions.c:
+      MFH: Fixed regression #31645 - only flush before running the subrequest.
+
+    * sapi/apache2handler/php_functions.c:
+      Fixed regression #31645 - only flush before running the subrequest.
+
 2005-01-23  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_4_3)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 180e51b4332..0c09138b419 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,17 @@
+2005-01-24  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_vm_def.h
+      zend_vm_execute.h
+      tests/bug30725.phpt:
+      - Second and last part of #30725 fix
+
+    * zend_interfaces.c:
+      - Allow getIterator() to fail
+
+    * tests/bug30725.phpt:
+      
+      - Add new test
+
 2005-01-22  Jani Taskinen  <jani.taskinen@kolumbus.fi>
 
     * (PHP_5_0)