From ea5dc3d577b7d983bb6f15d03df48606978030ee Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Tue, 6 Jul 2004 00:33:32 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 31 +++++++++++++++++++++++++++++++
 Zend/ChangeLog |  5 +++++
 2 files changed, 36 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d3222d0f113..55d38be18a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2004-07-05  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * NEWS
+      ext/mysqli/mysqli.c:
+      - Bugfix: #29019 Database not closing
+
+2004-07-05  Andi Gutmans  <andi@zend.com>
+
+    * ZendEngine2/zend_mm.h:
+      - Disable zend_mm for 5.0.0
+
+2004-07-05  Sascha Schumann  <sascha@schumann.cx>
+
+    * (PHP_4_3)
+      NEWS:
+      add
+
+    * sapi/cgi/cgi_main.c:
+      - revert to proper behaviour
+
+    * (PHP_4_3)
+      sapi/cgi/cgi_main.c:
+      - revert to proper behaviour. The environment variable PHP_FCGI_CHILDREN
+        must be explicitly set to != 0 to make the fastcgi-enabled binary
+        act as a standalone fcgi server.
+
+2004-07-05  Moriyoshi Koizumi  <moriyoshi@at.wakwak.com>
+
+    * ext/standard/tests/serialize/bug28325.phpt:
+      - Add test for bug #28325.
+
 2004-07-04  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/interbase/ibase_query.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 648c6ae5191..63171cb7c5f 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-05  Andi Gutmans  <andi@zend.com>
+
+    * zend_mm.h:
+      - Disable zend_mm for 5.0.0
+
 2004-07-03  Andi Gutmans  <andi@zend.com>
 
     * zend_alloc.c: