From db7af4d8f00d489384406d5ebbfc66c42a74c6f4 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Sat, 18 Sep 2004 00:35:27 +0000
Subject: ChangeLog update

---
 ChangeLog      | 29 +++++++++++++++++++++++++++++
 Zend/ChangeLog |  7 +++++++
 2 files changed, 36 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 446356207a..21159e1464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2004-09-17  Wez Furlong  <wez.php@thebrainroom.net>
+
+    * main/network.c
+      main/streams/xp_socket.c:
+      Make new poll stuff work on win32 (and still be safe on unix)
+
+    * ext/readline/readline.c:
+      standardize the callback support to allow array($obj, 'method') callbacks.
+      Add a couple of utility functions.
+
+2004-09-17  Stanislav Malyshev  <stas@zend.com>
+
+    * ZendEngine2/zend_execute_API.c
+      ZendEngine2/zend_objects_API.c
+      ZendEngine2/zend_objects_API.h:
+      fix crash when dtor is fialing on shutdown
+
+2004-09-17  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      NEWS
+      main/php_ini.c
+      main/php_ini.c:
+      MFH: Fixed bug #30050 (Possible crash inside php_shutdown_config()).
+
+    * main/php_ini.c:
+      Fixed bug #30050 (Possible crash inside php_shutdown_config()).
+      
+
 2004-09-16  Andi Gutmans  <andi@zend.com>
 
     * (PHP_5_0)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 9815be4c3c..fa49ee3705 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-17  Stanislav Malyshev  <stas@zend.com>
+
+    * zend_execute_API.c
+      zend_objects_API.c
+      zend_objects_API.h:
+      fix crash when dtor is fialing on shutdown
+
 2004-09-16  Andi Gutmans  <andi@zend.com>
 
     * (PHP_5_0)
-- 
cgit v1.2.1