Commit: e081c55fb50d5a088d93a15834e7ec8129097fb3
Author: Xinchen Hui <larue...@php.net> Wed, 10 Oct 2012 10:31:31
+0800
Parents: e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916
610c7fbe7b93498154b17e4e81018b72fa15ec45
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e081c55fb50d5a088d93a15834e7ec8129097fb3
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM Zend/tests/array_type_hint_001.phpt
MM Zend/tests/bug35655.phpt
MM Zend/tests/bug39304.phpt
MM Zend/tests/constants_005.phpt
MM Zend/tests/multibyte/multibyte_encoding_001.phpt
MM Zend/tests/multibyte/multibyte_encoding_002.phpt
MM Zend/tests/multibyte/multibyte_encoding_003.phpt
MM ext/dom/tests/DOMAttr_value_basic_001.phpt
MM ext/dom/tests/DOMCharacterData_data_error_002.phpt
MM ext/dom/tests/DOMCharacterData_length_error_001.phpt
MM ext/exif/tests/bug34704.phpt
MM ext/mysql/tests/mysql_pconn_kill.phpt
MM ext/phar/tests/019b.phpt
MM ext/phar/tests/019c.phpt
MM ext/phar/tests/028.phpt
MM ext/phar/tests/rename_dir_and_mount.phpt
MM ext/simplexml/tests/034.phpt
MM ext/spl/tests/array_001.phpt
MM ext/spl/tests/array_004.phpt
MM ext/spl/tests/array_008.phpt
MM ext/spl/tests/array_010.phpt
MM ext/spl/tests/iterator_026.phpt
MM ext/spl/tests/iterator_041b.phpt
MM ext/spl/tests/iterator_044.phpt
MM ext/spl/tests/iterator_047.phpt
MM ext/spl/tests/iterator_050.phpt
MM ext/spl/tests/iterator_052.phpt
MM ext/spl/tests/iterator_054.phpt
MM ext/spl/tests/spl_004.phpt
MM ext/standard/tests/array/bug29253.phpt
MM ext/standard/tests/file/glob_variation.phpt
MM ext/standard/tests/file/stream_rfc2397_006.phpt
MM ext/standard/tests/general_functions/getservbyname_variation10.phpt
MM ext/standard/tests/general_functions/getservbyname_variation9.phpt
MM ext/xml/tests/xml_closures_001.phpt
MM tests/classes/array_access_010.phpt
MM tests/classes/ctor_in_interface_01.phpt
MM tests/classes/ctor_in_interface_02.phpt
MM tests/classes/ctor_in_interface_03.phpt
MM tests/classes/ctor_in_interface_04.phpt
MM tests/classes/inheritance_003.phpt
MM tests/classes/inheritance_004.phpt
MM tests/classes/type_hinting_003.phpt
MM tests/lang/bug29566.phpt
MM tests/lang/bug35176.phpt
diff --cc Zend/tests/array_type_hint_001.phpt
index a676992,533319b..a676992
mode 100755,100644..100644
--- a/Zend/tests/array_type_hint_001.phpt
+++ b/Zend/tests/array_type_hint_001.phpt
diff --cc Zend/tests/bug35655.phpt
index bbb1377,10d9c0c..bbb1377
mode 100755,100644..100644
--- a/Zend/tests/bug35655.phpt
+++ b/Zend/tests/bug35655.phpt
diff --cc Zend/tests/bug39304.phpt
index 8303b82,0129d21..8303b82
mode 100755,100644..100644
--- a/Zend/tests/bug39304.phpt
+++ b/Zend/tests/bug39304.phpt
diff --cc Zend/tests/constants_005.phpt
index d2a205b,55f90fd..d2a205b
mode 100755,100644..100644
--- a/Zend/tests/constants_005.phpt
+++ b/Zend/tests/constants_005.phpt
diff --cc Zend/tests/multibyte/multibyte_encoding_001.phpt
index 38aa80a,19b6064..38aa80a
mode 100755,100644..100644
--- a/Zend/tests/multibyte/multibyte_encoding_001.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt
diff --cc Zend/tests/multibyte/multibyte_encoding_002.phpt
index 6e1ad80,813222d..6e1ad80
mode 100755,100644..100644
--- a/Zend/tests/multibyte/multibyte_encoding_002.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt
diff --cc Zend/tests/multibyte/multibyte_encoding_003.phpt
index 0f873dd,badfcc5..0f873dd
mode 100755,100644..100644
Binary files differ
diff --cc ext/dom/tests/DOMAttr_value_basic_001.phpt
index 51c4ac9,40e00bc..51c4ac9
mode 100755,100644..100644
--- a/ext/dom/tests/DOMAttr_value_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt
diff --cc ext/dom/tests/DOMCharacterData_data_error_002.phpt
index 401e0f2,9dae096..401e0f2
mode 100755,100644..100644
--- a/ext/dom/tests/DOMCharacterData_data_error_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_data_error_002.phpt
diff --cc ext/dom/tests/DOMCharacterData_length_error_001.phpt
index e8bf16a,0dda492..e8bf16a
mode 100755,100644..100644
--- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt
diff --cc ext/exif/tests/bug34704.phpt
index 7688ce8,b6b26de..7688ce8
mode 100755,100644..100644
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
diff --cc ext/mysql/tests/mysql_pconn_kill.phpt
index efef421,20dfbe9..efef421
mode 100755,100644..100644
--- a/ext/mysql/tests/mysql_pconn_kill.phpt
+++ b/ext/mysql/tests/mysql_pconn_kill.phpt
diff --cc ext/phar/tests/019b.phpt
index 5a0ef71,22d193e..5a0ef71
mode 100755,100644..100644
--- a/ext/phar/tests/019b.phpt
+++ b/ext/phar/tests/019b.phpt
diff --cc ext/phar/tests/019c.phpt
index 2cb508c,23afa26..2cb508c
mode 100755,100644..100644
--- a/ext/phar/tests/019c.phpt
+++ b/ext/phar/tests/019c.phpt
diff --cc ext/phar/tests/028.phpt
index 087f822,8cead29..087f822
mode 100755,100644..100644
--- a/ext/phar/tests/028.phpt
+++ b/ext/phar/tests/028.phpt
diff --cc ext/phar/tests/rename_dir_and_mount.phpt
index b74f47b,3a4df62..b74f47b
mode 100755,100644..100644
--- a/ext/phar/tests/rename_dir_and_mount.phpt
+++ b/ext/phar/tests/rename_dir_and_mount.phpt
diff --cc ext/simplexml/tests/034.phpt
index 8610f70,1f3a854..8610f70
mode 100755,100644..100644
--- a/ext/simplexml/tests/034.phpt
+++ b/ext/simplexml/tests/034.phpt
diff --cc ext/spl/tests/array_001.phpt
index b55fcba,d9fb57c..b55fcba
mode 100755,100644..100644
--- a/ext/spl/tests/array_001.phpt
+++ b/ext/spl/tests/array_001.phpt
diff --cc ext/spl/tests/array_004.phpt
index 0b80e5c,dd07f29..0b80e5c
mode 100755,100644..100644
--- a/ext/spl/tests/array_004.phpt
+++ b/ext/spl/tests/array_004.phpt
diff --cc ext/spl/tests/array_008.phpt
index e7a618d,61c7abd..e7a618d
mode 100755,100644..100644
--- a/ext/spl/tests/array_008.phpt
+++ b/ext/spl/tests/array_008.phpt
diff --cc ext/spl/tests/array_010.phpt
index d2f3de7,6b331e4..d2f3de7
mode 100755,100644..100644
--- a/ext/spl/tests/array_010.phpt
+++ b/ext/spl/tests/array_010.phpt
diff --cc ext/spl/tests/iterator_026.phpt
index 8eb77a7,1e60582..8eb77a7
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_026.phpt
+++ b/ext/spl/tests/iterator_026.phpt
diff --cc ext/spl/tests/iterator_041b.phpt
index e7ea8b8,e166f6b..e7ea8b8
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_041b.phpt
+++ b/ext/spl/tests/iterator_041b.phpt
diff --cc ext/spl/tests/iterator_044.phpt
index 1271cca,6d25531..1271cca
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_044.phpt
+++ b/ext/spl/tests/iterator_044.phpt
diff --cc ext/spl/tests/iterator_047.phpt
index 548f486,e5fec4f..548f486
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_047.phpt
+++ b/ext/spl/tests/iterator_047.phpt
diff --cc ext/spl/tests/iterator_050.phpt
index fed4a3b,63d8fbf..fed4a3b
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_050.phpt
+++ b/ext/spl/tests/iterator_050.phpt
diff --cc ext/spl/tests/iterator_052.phpt
index c68bd52,a0cbdd8..c68bd52
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_052.phpt
+++ b/ext/spl/tests/iterator_052.phpt
diff --cc ext/spl/tests/iterator_054.phpt
index 1f1cd58,91266c9..1f1cd58
mode 100755,100644..100644
--- a/ext/spl/tests/iterator_054.phpt
+++ b/ext/spl/tests/iterator_054.phpt
diff --cc ext/spl/tests/spl_004.phpt
index 97896f8,bea5695..97896f8
mode 100755,100644..100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
diff --cc ext/standard/tests/array/bug29253.phpt
index 4be9839,378489f..4be9839
mode 100755,100644..100644
--- a/ext/standard/tests/array/bug29253.phpt
+++ b/ext/standard/tests/array/bug29253.phpt
diff --cc ext/standard/tests/file/glob_variation.phpt
index 00fd6ff,64d3d8a..00fd6ff
mode 100755,100644..100644
--- a/ext/standard/tests/file/glob_variation.phpt
+++ b/ext/standard/tests/file/glob_variation.phpt
diff --cc ext/standard/tests/file/stream_rfc2397_006.phpt
index e6694a2,b1b3111..e6694a2
mode 100755,100644..100644
--- a/ext/standard/tests/file/stream_rfc2397_006.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_006.phpt
diff --cc ext/standard/tests/general_functions/getservbyname_variation10.phpt
index c7ed144,70aa567..c7ed144
mode 100755,100644..100644
--- a/ext/standard/tests/general_functions/getservbyname_variation10.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_variation10.phpt
diff --cc ext/standard/tests/general_functions/getservbyname_variation9.phpt
index eef2744,c1c231e..eef2744
mode 100755,100644..100644
--- a/ext/standard/tests/general_functions/getservbyname_variation9.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_variation9.phpt
diff --cc ext/xml/tests/xml_closures_001.phpt
index 37df254,5439a2a..37df254
mode 100755,100644..100644
--- a/ext/xml/tests/xml_closures_001.phpt
+++ b/ext/xml/tests/xml_closures_001.phpt
diff --cc tests/classes/array_access_010.phpt
index ad374d2,e60716d..ad374d2
mode 100755,100644..100644
--- a/tests/classes/array_access_010.phpt
+++ b/tests/classes/array_access_010.phpt
diff --cc tests/classes/ctor_in_interface_01.phpt
index e5ad30e,f6f9b66..e5ad30e
mode 100755,100644..100644
--- a/tests/classes/ctor_in_interface_01.phpt
+++ b/tests/classes/ctor_in_interface_01.phpt
diff --cc tests/classes/ctor_in_interface_02.phpt
index 08e6f36,ad9fac3..08e6f36
mode 100755,100644..100644
--- a/tests/classes/ctor_in_interface_02.phpt
+++ b/tests/classes/ctor_in_interface_02.phpt
diff --cc tests/classes/ctor_in_interface_03.phpt
index ac73331,953d682..ac73331
mode 100755,100644..100644
--- a/tests/classes/ctor_in_interface_03.phpt
+++ b/tests/classes/ctor_in_interface_03.phpt
diff --cc tests/classes/ctor_in_interface_04.phpt
index 94be655,0016244..94be655
mode 100755,100644..100644
--- a/tests/classes/ctor_in_interface_04.phpt
+++ b/tests/classes/ctor_in_interface_04.phpt
diff --cc tests/classes/inheritance_003.phpt
index 1f4eafa,a22e5cc..1f4eafa
mode 100755,100644..100644
--- a/tests/classes/inheritance_003.phpt
+++ b/tests/classes/inheritance_003.phpt
diff --cc tests/classes/inheritance_004.phpt
index d1f5faf,9c81970..d1f5faf
mode 100755,100644..100644
--- a/tests/classes/inheritance_004.phpt
+++ b/tests/classes/inheritance_004.phpt
diff --cc tests/classes/type_hinting_003.phpt
index a966210,431d66e..a966210
mode 100755,100644..100644
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
diff --cc tests/lang/bug29566.phpt
index 16aec8f,5f292bd..16aec8f
mode 100755,100644..100644
--- a/tests/lang/bug29566.phpt
+++ b/tests/lang/bug29566.phpt
diff --cc tests/lang/bug35176.phpt
index 2928f7e,dd56c76..2928f7e
mode 100755,100644..100644
--- a/tests/lang/bug35176.phpt
+++ b/tests/lang/bug35176.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
