From 4543e8fecff9c6cfc6bb417518598674529264e8 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Fri, 3 Oct 2008 01:31:55 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog |  9 ++++++++
 2 files changed, 67 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 52c9df7ab7..8cc8314d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2008-10-02  Zoe Slattery  <zoe.slattery@googlemail.com>
+
+    * (PHP_5_3)
+      ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+      ext/simplexml/tests/simplexml_load_file.phpt:
+      Committting tests for Olafur Waage
+
+    * ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+      ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+      ext/simplexml/tests/simplexml_load_file.phpt
+      ext/simplexml/tests/simplexml_load_file.phpt:
+      
+      Committting tests for Olafur Waage
+
+2008-10-02  Etienne Kneuss  <php@colder.ch>
+
+    * (PHP_5_3)
+      ZendEngine2/zend_execute_API.c:
+      MFH: Use enum alternative instead of explicit value
+
+    * ZendEngine2/zend_execute_API.c:
+      Use enum alternative instead of explicit value
+
+2008-10-02  Antony Dovgal  <tony@daylessday.org>
+
+    * (PHP_5_3)
+      ext/standard/info.c
+      ext/standard/streamsfuncs.c:
+      MFH: use HashPosition to prevent race condition in multithreaded env
+
+    * ext/standard/info.c
+      ext/standard/streamsfuncs.c:
+      use HashPosition to prevent race condition in multithreaded env
+
+2008-10-02  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_2)
+      NEWS
+      ext/json/json.c
+      ext/json/json.c
+      ext/json/tests/bug46215.phpt:
+      - MFH: Fixed bug #46215 (json_encode mutates its parameter and has some
+      class-specific state)
+
+    * (PHP_5_3)
+      ext/json/tests/bug46215.phpt:
+      - New test
+
+    * ext/json/tests/bug46215.phpt
+      ext/json/tests/bug46215.phpt
+      ext/json/tests/bug46215.phpt:
+        1.1.4;
+      - New test
+
+    * ext/json/json.c:
+      - Fixed bug #46215 (json_encode mutates its parameter and has some
+      class-specific state)
+
 2008-10-01  Johannes Schlüter  <johannes@schlueters.de>
 
     * ext/mysqlnd/php_mysqlnd.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 4c3ea21740..5ea0cd10bb 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-02  Etienne Kneuss  <php@colder.ch>
+
+    * (PHP_5_3)
+      zend_execute_API.c:
+      MFH: Use enum alternative instead of explicit value
+
+    * zend_execute_API.c:
+      Use enum alternative instead of explicit value
+
 2008-10-01  Antony Dovgal  <tony@daylessday.org>
 
     * zend_execute_API.c:
-- 
2.50.1