From 8b5e65f2474523e1e232dbb4146d0f976d055dcd Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Thu, 18 Oct 2007 01:31:31 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 13 ++++++++
 2 files changed, 98 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 66fad45fd21..026843f834b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2007-10-17  Johannes Schl�ter  <johannes@schlueters.de>
+
+    * (PHP_5_3)
+      NEWS:
+      - There's no need to mention these bugs, they all belong to "Added
+      namespaces"
+
+2007-10-17  Antony Dovgal  <tony@daylessday.org>
+
+    * (PHP_4_4)
+      Zend/zend_operators.h:
+      fix constant value (somebody forgot to MFH?)
+
+2007-10-17  Dmitry Stogov  <dmitry@zend.com>
+
+    * ext/soap/tests/classmap004.phpt
+      ext/soap/tests/classmap004.phpt
+      ext/soap/tests/classmap004.phpt:
+        1.1.4;
+      file classmap004.phpt was initially added on branch PHP_5_2.
+
+    * (PHP_5_2)
+      NEWS
+      NEWS
+      ext/soap/php_encoding.c
+      ext/soap/php_encoding.c
+      ext/soap/php_encoding.c
+      ext/soap/tests/classmap004.phpt
+      ext/soap/tests/classmap004.phpt:
+      Fixed possible crash because of uninitialized value (Zdash Urf)
+
+    * (PHP_5_3)
+      NEWS
+      ext/soap/php_http.c
+      ext/soap/php_http.c:
+      Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill
+      Moran)
+
+    * (PHP_5_2)
+      NEWS
+      ext/soap/php_http.c:
+      Fixed bug #42637 (SoapFault : Only http and https are allowed)
+
+    * (PHP_5_3)
+      NEWS
+      ext/standard/var_unserializer.c
+      ext/standard/var_unserializer.c
+      ext/standard/var_unserializer.re
+      ext/standard/var_unserializer.re
+      ext/standard/tests/serialize/bug42919.phpt
+      ext/standard/tests/serialize/bug42919.phpt
+      ext/standard/tests/serialize/bug42919.phpt:
+      Fixed bug #42919 (Unserializing of namespaced class object fails)
+
+    * ZendEngine2/tests/bug42859.phpt
+      ZendEngine2/tests/bug42859.phpt:
+      
+      file bug42859.phpt was initially added on branch PHP_5_3.
+
+    * (PHP_5_3)
+      NEWS
+      ZendEngine2/zend_compile.c
+      ZendEngine2/zend_compile.c
+      ZendEngine2/tests/bug42859.phpt:
+      Fixed bug #42859 (import always conflicts with internal classes).
+      (cellog@php.net, Dmitry)
+
+2007-10-17  Antony Dovgal  <tony@daylessday.org>
+
+    * ext/mysqli/mysqli_api.c:
+      commit lost part of the patch
+
+    * (PHP_5_3)
+      ext/mysqli/mysqli_api.c:
+      ..and correct macro
+
+    * (PHP_5_3)
+      ext/mysqli/mysqli.c
+      ext/mysqli/mysqli_api.c:
+      MFH: use correct dtro and variable for the callback
+
+    * ext/mysqli/mysqli.c
+      ext/mysqli/mysqli_api.c:
+      use correct dtor and variable for the callback
+
 2007-10-16  Andrey Hristov  <php@hristov.com>
 
     * ext/mysql/php_mysql.c
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index b5d46e5f2f7..5d3f960e828 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-17  Dmitry Stogov  <dmitry@zend.com>
+
+    * zend_compile.c
+      zend_compile.c
+      tests/bug42859.phpt:
+      Fixed bug #42859 (import always conflicts with internal classes).
+      (cellog@php.net, Dmitry)
+
+    * tests/bug42859.phpt
+      tests/bug42859.phpt:
+      
+      file bug42859.phpt was initially added on branch PHP_5_3.
+
 2007-10-13  Hannes Magnusson  <hannes.magnusson@gmail.com>
 
     * tests/bug42819.phpt: