From 762603f66c5e5bc383739808c051441d13138f0e Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Wed, 7 Jun 2006 05:32:04 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 28 +++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index aa80fd6a39d..3f24ce30aff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+2006-06-06  Michael Wallner  <mike@iworks.at>
+
+    * main/output.c:
+      - fix SEGV in php_output_handler_started()
+
+    * ext/curl/streams.c:
+      MFB: only try to fetch stream context options if context is set
+
+    * (PHP_5_2)
+      ext/curl/streams.c:
+      - only try to fetch stream context options if context is set
+
+2006-06-06  Antony Dovgal  <antony@zend.com>
+
+    * NEWS:
+      this function also exists in 5.2, no need for this news entry in HEAD
+
+    * ZendEngine2/zend_compile.c
+      ZendEngine2/zend_compile.c:
+      revert by Andi's request
+
+    * main/streams/memory.c:
+      don't leak when decoding failed
+
+2006-06-06  Rob Richards  <rrichards@ctindustries.net>
+
+    * (PHP_5_2)
+      ext/dom/php_dom.c:
+      nuke unused call
+
+    * (PHP_5_2)
+      ext/simplexml/simplexml.c:
+      restore missing ze1 compat code
+
+2006-06-06  Antony Dovgal  <antony@zend.com>
+
+    * ZendEngine2/tests/bug33732.phpt
+      ZendEngine2/tests/bug33732.phpt:
+      fix test
+
+2006-06-06  Michael Wallner  <mike@iworks.at>
+
+    * main/output.c:
+      - fix regression with bug #22690 (ob_start() with create_function() output
+      handler)
+
+2006-06-06  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      ZendEngine2/zend_compile.c
+      ZendEngine2/tests/objects_012.phpt
+      ZendEngine2/tests/objects_013.phpt
+      ZendEngine2/tests/objects_014.phpt:
+      MFH: do not allow to implement the same interface twice
+      add tests
+
+    * ZendEngine2/zend_compile.c
+      ZendEngine2/tests/objects_012.phpt
+      ZendEngine2/tests/objects_012.phpt
+      ZendEngine2/tests/objects_013.phpt
+      ZendEngine2/tests/objects_013.phpt
+      ZendEngine2/tests/objects_014.phpt
+      ZendEngine2/tests/objects_014.phpt:
+      do not allow to implement the same interface twice
+      add tests
+
 2006-06-05  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/sysvmsg/sysvmsg.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index ea2f6c5876f..90472f79aa0 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,31 @@
+2006-06-06  Antony Dovgal  <antony@zend.com>
+
+    * zend_compile.c
+      zend_compile.c:
+      revert by Andi's request
+
+    * tests/bug33732.phpt
+      tests/bug33732.phpt:
+      fix test
+
+    * (PHP_5_2)
+      zend_compile.c
+      tests/objects_012.phpt
+      tests/objects_013.phpt
+      tests/objects_014.phpt:
+      MFH: do not allow to implement the same interface twice
+      add tests
+
+    * zend_compile.c
+      tests/objects_012.phpt
+      tests/objects_012.phpt
+      tests/objects_013.phpt
+      tests/objects_013.phpt
+      tests/objects_014.phpt
+      tests/objects_014.phpt:
+      do not allow to implement the same interface twice
+      add tests
+
 2006-06-05  Zeev Suraski  <zeev@zend.com>
 
     * (PHP_5_2)