From 1eb7fc2dd7b1882cdedfbc15653f30a478fedd68 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Sat, 9 Jun 2007 01:31:16 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 11 ++++++++
 2 files changed, 87 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4adf732923..a47dde98a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2007-06-08  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      NEWS:
+      bfn
+
+    * (PHP_5_2)
+      ZendEngine2/zend_ini.c:
+      MFH: fix #41561 (Values set with php_admin_* in httpd.conf can be
+      overwritten with ini_set())
+
+    * ZendEngine2/zend_ini.c:
+      fix #41561 (Values set with php_admin_* in httpd.conf can be overwritten
+      with ini_set())
+
+    * ext/json/tests/pass001.1.phpt
+      ext/json/tests/pass001.1_64bit.phpt
+      ext/json/tests/pass001.phpt:
+      fix tests
+
+    * ext/json/JSON_parser.c:
+      oops, empty properties are not allowed
+
+    * ext/json/JSON_parser.c:
+      MFB: fix #41504 (json_decode() incorrectly decodes JSON arrays with empty
+      string keys).
+
+    * (PHP_5_2)
+      NEWS:
+      news
+
+    * (PHP_5_2)
+      ext/oci8/oci8.c
+      ext/oci8/oci8_statement.c:
+      MFH: enable statement cache for non-persistent connections (patch by Chris
+      Jones)
+
+    * ext/oci8/oci8.c
+      ext/oci8/oci8_statement.c:
+      enable statement cache for non-persistent connections (patch by Chris
+      Jones)
+
+    * (PHP_5_2)
+      ext/json/tests/pass001.1_64bit.phpt:
+      adjust test for 64bit
+
+    * (PHP_5_2)
+      ext/json/tests/pass001.1.phpt
+      ext/json/tests/pass001.1_64bit.phpt
+      ext/json/tests/pass001.1_64bit.phpt:
+      fix test, add 64bit version
+
+2007-06-08  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * (PHP_4_4)
+      NEWS
+      ext/gd/libgd/gd_gif_in.c:
+      - MFH:#41630, segfault when an invalid color index is present in the image
+        data
+
+    * (PHP_5_2)
+      NEWS:
+      - #41630 entry
+
+    * ext/gd/libgd/gd_gif_in.c:
+      - MFB: #41630, fix segfault when an invalid color index is present in the
+        image data
+
+2007-06-08  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      NEWS
+      ext/bcmath/bcmath.c:
+      
+      Added missing error check inside bcpowmod().
+
 2007-06-07  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/date/php_date.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 612725a2a8..4e5cebb27c 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-08  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      zend_ini.c:
+      MFH: fix #41561 (Values set with php_admin_* in httpd.conf can be
+      overwritten with ini_set())
+
+    * zend_ini.c:
+      fix #41561 (Values set with php_admin_* in httpd.conf can be overwritten
+      with ini_set())
+
 2007-06-07  Antony Dovgal  <antony@zend.com>
 
     * (PHP_5_2)
-- 
2.40.0