ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index a47dde98a222b25b0e3ce0e53c7fb548c1c39ad1..d382f52b12332ddb09963f8077037a35640e4c8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2007-06-09  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * Makefile.global:
+      MFB
+
+    * (PHP_5_2)
+      Makefile.global:
+      - Fix special case of no ini file in use or not found
+
+    * Makefile.global:
+      - fix "make test" issue with extension entries
+
+    * (PHP_5_2)
+      NEWS
+      ext/standard/basic_functions.c
+      ext/standard/info.c
+      ext/standard/info.h:
+      MFH:- Added php_ini_loaded_file() function which returns the path to the
+      actual
+        php.ini in use.
+
+    * ext/standard/basic_functions.c
+      ext/standard/info.c
+      ext/standard/info.h:
+      - Added php_ini_loaded_file() function which returns the path to the actual
+        php.ini in use.
+
+2007-06-09  Johannes Schlüter  <johannes@schlueters.de>
+
+    * (PHP_5_2)
+      NEWS
+      ZendEngine2/zend_builtin_functions.c
+      ZendEngine2/zend_builtin_functions.c
+      ZendEngine2/tests/bug41640.phpt:
+      Fix #41640 (get_class_vars produces error on class constants)
+
+    * ZendEngine2/tests/bug41640.phpt
+      ZendEngine2/tests/bug41640.phpt:
+      
+      Fix #41640 (get_class_vars produces error on class constants)
+
 2007-06-08  Antony Dovgal  <antony@zend.com>
 
     * (PHP_5_2)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 4e5cebb27ce27fe8ac357c22212dcfa15bfba1b0..873eda20a4c279133db9ce74c7670f68a77bcb4b 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-09  Johannes Schlüter  <johannes@schlueters.de>
+
+    * zend_builtin_functions.c
+      zend_builtin_functions.c
+      tests/bug41640.phpt
+      tests/bug41640.phpt
+      tests/bug41640.phpt:
+      Fix #41640 (get_class_vars produces error on class constants)
+
 2007-06-08  Antony Dovgal  <antony@zend.com>
 
     * (PHP_5_2)