ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index 77a525a81bb634c75f8af05d0d663d6fddec3cdc..cb5f6cd851ecb69cb731efa3739fa0398fcb517c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,271 @@
+2009-06-12  Felipe Pena  <felipensp@gmail.com>
+
+    * ZendEngine2/zend_object_handlers.c
+      ZendEngine2/zend_object_handlers.c:
+      - Constified method_name arg. in zend_get_user_call_function() and
+      zend_get_user_callstatic_function()
+
+    * (PHP_5_2)
+      ZendEngine2/zend_object_handlers.c:
+      - MFH some changes (from last fix on 5.3+)
+      - Constified method_name arg in zend_get_user_call_function()
+
+    * (PHP_5_2)
+      NEWS
+      ext/curl/interface.c
+      ext/curl/interface.c
+      ext/curl/tests/bug48514.phpt
+      ext/curl/tests/bug48514.phpt:
+      - MFH: Fixed bug #48514 (cURL extension uses same resource name for simple
+      and multi APIs)
+
+    * ext/curl/tests/bug48514.phpt
+      ext/curl/tests/bug48514.phpt
+      ext/curl/tests/bug48514.phpt:
+        1.3.4;
+      - Refix the fix :| (missing skipif)
+
+    * ext/curl/tests/bug48514.phpt:
+      - Fix test
+
+    * ext/curl/interface.c
+      ext/curl/tests/bug48514.phpt:
+      - Fixed bug #48514 (cURL extension uses same resource name for simple and
+      multi APIs)
+
+2009-06-12  andy wharmby  <wharmby@uk.ibm.com>
+
+    * (PHP_5_2)
+      ext/iconv/tests/iconv_strlen_basic.phpt
+      ext/iconv/tests/iconv_strlen_error1.phpt
+      ext/iconv/tests/iconv_strlen_error2.phpt
+      ext/iconv/tests/iconv_strlen_variation1.phpt
+      ext/iconv/tests/iconv_strlen_variation2.phpt
+      ext/iconv/tests/iconv_strpos_error2.phpt:
+      New iconv extension tests. Tested on Windows, Linux and Linux 64 bit.
+
+    * ext/iconv/tests/iconv_strlen_basic.phpt
+      ext/iconv/tests/iconv_strlen_basic.phpt
+      ext/iconv/tests/iconv_strlen_error1.phpt
+      ext/iconv/tests/iconv_strlen_error1.phpt
+      ext/iconv/tests/iconv_strlen_error2.phpt
+      ext/iconv/tests/iconv_strlen_error2.phpt
+      ext/iconv/tests/iconv_strlen_variation1.phpt
+      ext/iconv/tests/iconv_strlen_variation1.phpt
+      ext/iconv/tests/iconv_strlen_variation2.phpt
+      ext/iconv/tests/iconv_strlen_variation2.phpt
+      ext/iconv/tests/iconv_strpos_error2.phpt
+      ext/iconv/tests/iconv_strpos_error2.phpt:
+      
+      New iconv extension tests. Tested on Windows, Linux and Linux 64 bit.
+
+    * ext/iconv/tests/iconv_strlen_basic.phpt
+      ext/iconv/tests/iconv_strlen_basic.phpt
+      ext/iconv/tests/iconv_strlen_error1.phpt
+      ext/iconv/tests/iconv_strlen_error1.phpt
+      ext/iconv/tests/iconv_strlen_error2.phpt
+      ext/iconv/tests/iconv_strlen_error2.phpt
+      ext/iconv/tests/iconv_strlen_variation1.phpt
+      ext/iconv/tests/iconv_strlen_variation1.phpt
+      ext/iconv/tests/iconv_strlen_variation2.phpt
+      ext/iconv/tests/iconv_strlen_variation2.phpt
+      ext/iconv/tests/iconv_strpos_error2.phpt
+      ext/iconv/tests/iconv_strpos_error2.phpt:
+      
+      file iconv_strlen_basic.phpt was initially added on branch PHP_5_3.
+
+    * (PHP_5_2)
+      ext/iconv/tests/iconv_basic.phpt
+      ext/iconv/tests/iconv_encoding_basic.phpt
+      ext/iconv/tests/iconv_get_encoding_error.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation3.phpt
+      ext/iconv/tests/iconv_set_encoding_error.phpt
+      ext/iconv/tests/iconv_set_encoding_variation.phpt
+      ext/iconv/tests/iconv_strpos_basic.phpt
+      ext/iconv/tests/iconv_strpos_error1.phpt
+      ext/iconv/tests/iconv_strpos_variation1.phpt
+      ext/iconv/tests/iconv_strpos_variation2.phpt
+      ext/iconv/tests/iconv_strpos_variation3.phpt
+      ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+      ext/iconv/tests/iconv_strpos_variation4.phpt
+      ext/iconv/tests/iconv_strpos_variation5.phpt
+      ext/iconv/tests/iconv_strrpos_basic.phpt
+      ext/iconv/tests/iconv_strrpos_error1.phpt
+      ext/iconv/tests/iconv_strrpos_error2.phpt
+      ext/iconv/tests/iconv_strrpos_variation1.phpt
+      ext/iconv/tests/iconv_strrpos_variation2.phpt
+      ext/iconv/tests/iconv_strrpos_variation3.phpt:
+      New iconv extension tests. Tested on Windows, Linux and Linux 64 bit
+
+    * ext/iconv/tests/iconv_basic.phpt
+      ext/iconv/tests/iconv_basic.phpt
+      ext/iconv/tests/iconv_encoding_basic.phpt
+      ext/iconv/tests/iconv_encoding_basic.phpt
+      ext/iconv/tests/iconv_get_encoding_error.phpt
+      ext/iconv/tests/iconv_get_encoding_error.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_variation3.phpt
+      ext/iconv/tests/iconv_set_encoding_error.phpt
+      ext/iconv/tests/iconv_set_encoding_error.phpt
+      ext/iconv/tests/iconv_set_encoding_variation.phpt
+      ext/iconv/tests/iconv_set_encoding_variation.phpt
+      ext/iconv/tests/iconv_strpos_basic.phpt
+      ext/iconv/tests/iconv_strpos_basic.phpt
+      ext/iconv/tests/iconv_strpos_error1.phpt
+      ext/iconv/tests/iconv_strpos_error1.phpt
+      ext/iconv/tests/iconv_strpos_variation1.phpt
+      ext/iconv/tests/iconv_strpos_variation1.phpt
+      ext/iconv/tests/iconv_strpos_variation2.phpt
+      ext/iconv/tests/iconv_strpos_variation2.phpt
+      ext/iconv/tests/iconv_strpos_variation3.phpt
+      ext/iconv/tests/iconv_strpos_variation3.phpt
+      ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+      ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+      ext/iconv/tests/iconv_strpos_variation4.phpt
+      ext/iconv/tests/iconv_strpos_variation4.phpt
+      ext/iconv/tests/iconv_strpos_variation5.phpt
+      ext/iconv/tests/iconv_strpos_variation5.phpt
+      ext/iconv/tests/iconv_strrpos_basic.phpt
+      ext/iconv/tests/iconv_strrpos_basic.phpt
+      ext/iconv/tests/iconv_strrpos_error1.phpt
+      ext/iconv/tests/iconv_strrpos_error1.phpt
+      ext/iconv/tests/iconv_strrpos_error2.phpt
+      ext/iconv/tests/iconv_strrpos_error2.phpt
+      ext/iconv/tests/iconv_strrpos_variation1.phpt
+      ext/iconv/tests/iconv_strrpos_variation1.phpt
+      ext/iconv/tests/iconv_strrpos_variation2.phpt
+      ext/iconv/tests/iconv_strrpos_variation2.phpt
+      ext/iconv/tests/iconv_strrpos_variation3.phpt
+      ext/iconv/tests/iconv_strrpos_variation3.phpt:
+      
+      New iconv extension tests. Tested on Windows, Linux and Linux 64 bit
+
+    * ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+      ext/iconv/tests/iconv_mime_decode_variation3.phpt
+      ext/iconv/tests/iconv_set_encoding_variation.phpt
+      ext/iconv/tests/iconv_set_encoding_variation.phpt
+      ext/iconv/tests/iconv_strpos_basic.phpt
+      ext/iconv/tests/iconv_strpos_basic.phpt
+      ext/iconv/tests/iconv_strpos_variation3.phpt
+      ext/iconv/tests/iconv_strpos_variation3.phpt
+      ext/iconv/tests/iconv_strpos_variation5.phpt
+      ext/iconv/tests/iconv_strpos_variation5.phpt:
+      
+      file iconv_mime_decode_headers_variation3.phpt was initially added on
+      branch PHP_5_3.
+
+    * ext/iconv/tests/iconv_basic.phpt
+      ext/iconv/tests/iconv_basic.phpt
+      ext/iconv/tests/iconv_encoding_basic.phpt
+      ext/iconv/tests/iconv_encoding_basic.phpt
+      ext/iconv/tests/iconv_get_encoding_error.phpt
+      ext/iconv/tests/iconv_get_encoding_error.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_variation1.phpt
+      ext/iconv/tests/iconv_mime_decode_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation2.phpt
+      ext/iconv/tests/iconv_mime_decode_variation3.phpt
+      ext/iconv/tests/iconv_set_encoding_error.phpt
+      ext/iconv/tests/iconv_set_encoding_error.phpt
+      ext/iconv/tests/iconv_strpos_error1.phpt
+      ext/iconv/tests/iconv_strpos_error1.phpt
+      ext/iconv/tests/iconv_strpos_variation1.phpt
+      ext/iconv/tests/iconv_strpos_variation1.phpt
+      ext/iconv/tests/iconv_strpos_variation2.phpt
+      ext/iconv/tests/iconv_strpos_variation2.phpt
+      ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+      ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+      ext/iconv/tests/iconv_strpos_variation4.phpt
+      ext/iconv/tests/iconv_strpos_variation4.phpt
+      ext/iconv/tests/iconv_strrpos_basic.phpt
+      ext/iconv/tests/iconv_strrpos_basic.phpt
+      ext/iconv/tests/iconv_strrpos_error1.phpt
+      ext/iconv/tests/iconv_strrpos_error1.phpt
+      ext/iconv/tests/iconv_strrpos_error2.phpt
+      ext/iconv/tests/iconv_strrpos_error2.phpt
+      ext/iconv/tests/iconv_strrpos_variation1.phpt
+      ext/iconv/tests/iconv_strrpos_variation1.phpt
+      ext/iconv/tests/iconv_strrpos_variation2.phpt
+      ext/iconv/tests/iconv_strrpos_variation2.phpt
+      ext/iconv/tests/iconv_strrpos_variation3.phpt
+      ext/iconv/tests/iconv_strrpos_variation3.phpt:
+      
+      file iconv_basic.phpt was initially added on branch PHP_5_3.
+
+2009-06-12  Kalle Sommer Nielsen  <kalle.php@gmail.com>
+
+    * (PHP_5_3)
+      ext/mbstring/config.w32:
+      MFH: Fixed static build of mbstring on Windows (makes static build of exif
+      possible too)
+
+2009-06-12  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_3)
+      ext/exif/exif.c:
+      - Dropped unnecessary var
+
+    * ext/exif/exif.c:
+      - Sync with 5_3
+
+    * ext/exif/exif.c:
+      - Dropped unused var (HEAD only)
+
+2009-06-12  Andrey Hristov  <php@hristov.com>
+
+    * (PHP_5_3)
+      ext/mysqlnd/mysqlnd_enum_n_def.h
+      ext/mysqlnd/mysqlnd_statistics.c
+      ext/mysqlnd/mysqlnd_statistics.h
+      ext/mysqlnd/mysqlnd_wireprotocol.c:
+      MFH:
+      Fix crash when tracing is enabled. Position after buffer was used also
+      direct usage of MYSQLND_STRING pointer instead of the "s" property of the
+      structure.
+
+    * ext/mysqlnd/mysqlnd_enum_n_def.h
+      ext/mysqlnd/mysqlnd_statistics.c
+      ext/mysqlnd/mysqlnd_statistics.h
+      ext/mysqlnd/mysqlnd_wireprotocol.c:
+      Fix crash when tracing is enabled. Position after buffer was used also
+      direct usage of MYSQLND_STRING pointer instead of the "s" property of the
+      structure.
+
+2009-06-12  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_3)
+      NEWS
+      ZendEngine2/zend_object_handlers.c
+      ZendEngine2/tests/bug48533.phpt:
+      MFH: Fixed bug #48533 (__callStatic is not invoked for private/protected
+      methods)
+
+    * ZendEngine2/zend_object_handlers.c
+      ZendEngine2/tests/bug48533.phpt
+      ZendEngine2/tests/bug48533.phpt:
+      - Fixed bug #48533 (__callStatic is not invoked for private/protected
+      methods)
+
 2009-06-11  Kalle Sommer Nielsen  <kalle.php@gmail.com>
 
     * ext/mbstring/config.w32:

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 13d7fb480d9033eb7c2ebbc7f2044e795e77c7bc..bc65417f96e05200d56da3bbcba6d9845ba2efc4 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,27 @@
+2009-06-12  Felipe Pena  <felipensp@gmail.com>
+
+    * zend_object_handlers.c
+      zend_object_handlers.c:
+      - Constified method_name arg. in zend_get_user_call_function() and
+      zend_get_user_callstatic_function()
+
+    * (PHP_5_2)
+      zend_object_handlers.c:
+      - MFH some changes (from last fix on 5.3+)
+      - Constified method_name arg in zend_get_user_call_function()
+
+    * (PHP_5_3)
+      zend_object_handlers.c
+      tests/bug48533.phpt:
+      MFH: Fixed bug #48533 (__callStatic is not invoked for private/protected
+      methods)
+
+    * zend_object_handlers.c
+      tests/bug48533.phpt
+      tests/bug48533.phpt:
+      - Fixed bug #48533 (__callStatic is not invoked for private/protected
+      methods)
+
 2009-06-09  Pierre-Alain Joye  <pierre.dev@gmail.com>
 
     * (PHP_5_3)