2 files changed, 132 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62e329fd5a..8083bc5bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2006-02-20  Johannes Schl�ter  <schlueter@phpbar.de>
+
+    * (PHP_5_1)
+      NEWS:
+      - MFH: Rename reflection constants to fix parser conflicts
+
+2006-02-20  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * ZendEngine2/zend_execute_API.c:
+      - Synch zend_call_function() with VM function call helper
+
+    * ZendEngine2/zend_compile.h
+      ZendEngine2/zend_execute_API.c
+      ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h:
+      - Add deprecation flag and message
+
+2006-02-20  Dmitry Stogov  <dmitry@zend.com>
+
+    * ZendEngine2/zend.c
+      ZendEngine2/zend.h
+      ZendEngine2/zend_API.c
+      ZendEngine2/zend_API.h
+      ZendEngine2/zend_alloc.c
+      ZendEngine2/zend_builtin_functions.c
+      ZendEngine2/zend_compile.c
+      ZendEngine2/zend_constants.c
+      ZendEngine2/zend_exceptions.c
+      ZendEngine2/zend_execute.c
+      ZendEngine2/zend_execute.h
+      ZendEngine2/zend_execute_API.c
+      ZendEngine2/zend_highlight.c
+      ZendEngine2/zend_indent.c
+      ZendEngine2/zend_ini.c
+      ZendEngine2/zend_ini_parser.y
+      ZendEngine2/zend_ini_scanner.l
+      ZendEngine2/zend_interfaces.c
+      ZendEngine2/zend_iterators.c
+      ZendEngine2/zend_language_parser.y
+      ZendEngine2/zend_language_scanner.l
+      ZendEngine2/zend_list.c
+      ZendEngine2/zend_object_handlers.c
+      ZendEngine2/zend_object_handlers.h
+      ZendEngine2/zend_objects.c
+      ZendEngine2/zend_objects_API.c
+      ZendEngine2/zend_operators.c
+      ZendEngine2/zend_operators.h
+      ZendEngine2/zend_strtod.c
+      ZendEngine2/zend_variables.c
+      ZendEngine2/zend_variables.h
+      ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h:
+      Preparation for portable string API (use macroses to access zval).
+
+    * ext/standard/basic_functions.c:
+      Incorrect usage of Z_TYPE() macro
+
+2006-02-20  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_1)
+      NEWS:
+      Fixed bug #36434 (Improper resolution of declaring class name of an
+      inherited property).
+
+2006-02-20  Dmitry Stogov  <dmitry@zend.com>
+
+    * ext/dom/dom_iterators.c:
+      Fixed start inex in iterator
+
+    * ext/standard/proc_open.c:
+      Fixed memory corruption
+
+    * ext/pcre/tests/bug26927.phpt
+      ext/pcre/tests/bug26927.phpt
+      ext/pcre/tests/bug26927.phpt:
+      Fixed test file
+
+    * (PHP_4_4)
+      ext/openssl/tests/bug25614.phpt
+      ext/session/tests/bug31454.phpt
+      ext/standard/tests/general_functions/bug32647.phpt
+      ext/standard/tests/serialize/bug25378.phpt:
+      Fixed test files (added docref)
+
 2006-02-19  Michael Wallner  <mike@iworks.at>
 
     * (PHP_5_1)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 34e061dbc6..5de8f37010 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,51 @@
+2006-02-20  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_execute_API.c:
+      - Synch zend_call_function() with VM function call helper
+
+    * zend_compile.h
+      zend_execute_API.c
+      zend_vm_def.h
+      zend_vm_execute.h:
+      - Add deprecation flag and message
+
+2006-02-20  Dmitry Stogov  <dmitry@zend.com>
+
+    * zend.c
+      zend.h
+      zend_API.c
+      zend_API.h
+      zend_alloc.c
+      zend_builtin_functions.c
+      zend_compile.c
+      zend_constants.c
+      zend_exceptions.c
+      zend_execute.c
+      zend_execute.h
+      zend_execute_API.c
+      zend_highlight.c
+      zend_indent.c
+      zend_ini.c
+      zend_ini_parser.y
+      zend_ini_scanner.l
+      zend_interfaces.c
+      zend_iterators.c
+      zend_language_parser.y
+      zend_language_scanner.l
+      zend_list.c
+      zend_object_handlers.c
+      zend_object_handlers.h
+      zend_objects.c
+      zend_objects_API.c
+      zend_operators.c
+      zend_operators.h
+      zend_strtod.c
+      zend_variables.c
+      zend_variables.h
+      zend_vm_def.h
+      zend_vm_execute.h:
+      Preparation for portable string API (use macroses to access zval).
+
 2006-02-19  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * zend_API.c