From 816d28058047c565298416289fb0459106931537 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Thu, 6 Jul 2006 01:30:52 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 13 +++++++++++
 2 files changed, 75 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 156601378a3..5d418bb713a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+2006-07-05  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      ext/standard/php_fopen_wrapper.c:
+      E_ERROR > E_RECOVERABLE_ERROR
+
+2006-07-05  Antony Dovgal  <antony@zend.com>
+
+    * ext/mysqli/tests/bug38003.phpt:
+      add test
+
+    * ext/mysqli/tests/bug38003.phpt
+      ext/mysqli/tests/bug38003.phpt:
+      
+      file bug38003.phpt was initially added on branch PHP_5_2.
+
+    * tests/classes/factory_and_singleton_003.phpt
+      tests/classes/factory_and_singleton_004.phpt:
+      fix tests (take #2)
+
+    * tests/classes/factory_and_singleton_003.phpt
+      tests/classes/factory_and_singleton_003.phpt
+      tests/classes/factory_and_singleton_004.phpt
+      tests/classes/factory_and_singleton_004.phpt:
+      fix tests
+
+    * (PHP_5_2)
+      ZendEngine2/zend_object_handlers.c:
+      oops.. fix copy/paste typo
+
+    * (PHP_5_2)
+      NEWS:
+      BFN
+
+    * (PHP_5_2)
+      ext/mysqli/mysqli.c:
+      MFH: fix bug #38003(in classes inherited from mysqli it's possible to call
+      private constructors from invalid context)
+
+    * ext/mysqli/mysqli.c:
+      fix bug #38003(in classes inherited from mysqli it's possible to call
+      private constructors from invalid context)
+      also, use appropriate macro instead of accessing structure elements
+      directly
+
+    * ZendEngine2/zend_object_handlers.c
+      ZendEngine2/zend_object_handlers.h:
+      export zend_std_get_constructor()
+
+    * ZendEngine2/zend_object_handlers.c:
+      improve error messages
+
+2006-07-05  Edin Kadribasic  <edink@emini.dk>
+
+    * (PHP_5_2)
+      NEWS:
+      apache2filter on windows news
+
+    * sapi/apache2filter/config.w32:
+      Added windows build support for apach2filter, supporting apache 2.0.x and
+      2.2.x
+
 2006-07-04  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/curl/interface.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index b25de55d361..d861179eb90 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,16 @@
+2006-07-05  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      zend_object_handlers.c:
+      oops.. fix copy/paste typo
+
+    * zend_object_handlers.c
+      zend_object_handlers.h:
+      export zend_std_get_constructor()
+
+    * zend_object_handlers.c:
+      improve error messages
+
 2006-06-28  Andrei Zmievski  <andrei@gravitonic.com>
 
     * zend.c: