Merge branch 'PHP-5.3' into PHP-5.4

62 files changed, 0 insertions, 0 deletions

diff --git a/ext/phar/tests/003a.phpt b/ext/phar/tests/003a.phpt
index 37e31072d4..37e31072d4 100755..100644
--- a/ext/phar/tests/003a.phpt
+++ b/ext/phar/tests/003a.phpt
diff --git a/ext/phar/tests/015b.phpt b/ext/phar/tests/015b.phpt
index 08ead2d9c0..08ead2d9c0 100755..100644
--- a/ext/phar/tests/015b.phpt
+++ b/ext/phar/tests/015b.phpt
diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt
index 8fe66826d6..8fe66826d6 100755..100644
--- a/ext/phar/tests/016b.phpt
+++ b/ext/phar/tests/016b.phpt
diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt
index 5a0ef71335..5a0ef71335 100755..100644
--- a/ext/phar/tests/019b.phpt
+++ b/ext/phar/tests/019b.phpt
diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt
index 2cb508c46c..2cb508c46c 100755..100644
--- a/ext/phar/tests/019c.phpt
+++ b/ext/phar/tests/019c.phpt
diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt
index 808f91deae..808f91deae 100755..100644
--- a/ext/phar/tests/023.phpt
+++ b/ext/phar/tests/023.phpt
diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt
index ad30d2644d..ad30d2644d 100755..100644
--- a/ext/phar/tests/024.phpt
+++ b/ext/phar/tests/024.phpt
diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt
index bbb5bc4e83..bbb5bc4e83 100755..100644
--- a/ext/phar/tests/025.phpt
+++ b/ext/phar/tests/025.phpt
diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt
index 696fbcf415..696fbcf415 100755..100644
--- a/ext/phar/tests/026.phpt
+++ b/ext/phar/tests/026.phpt
diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 8736efbeb2..8736efbeb2 100755..100644
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt
index 087f822777..087f822777 100755..100644
--- a/ext/phar/tests/028.phpt
+++ b/ext/phar/tests/028.phpt
diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt
index 41fcec03e7..41fcec03e7 100755..100644
--- a/ext/phar/tests/029.phpt
+++ b/ext/phar/tests/029.phpt
diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt
index e1e94dba80..e1e94dba80 100755..100644
--- a/ext/phar/tests/030.phpt
+++ b/ext/phar/tests/030.phpt
diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index 4d5988621d..4d5988621d 100755..100644
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index faf3dcbf58..faf3dcbf58 100755..100644
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt
index d6c469d9cb..d6c469d9cb 100755..100644
--- a/ext/phar/tests/create_new_and_modify.phpt
+++ b/ext/phar/tests/create_new_and_modify.phpt
diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index 39fc31e27b..39fc31e27b 100755..100644
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt
index 6beaa2eb61..6beaa2eb61 100755..100644
--- a/ext/phar/tests/create_new_phar_c.phpt
+++ b/ext/phar/tests/create_new_phar_c.phpt
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index d3fc035860..d3fc035860 100755..100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt
index a6d5b3a35e..a6d5b3a35e 100755..100644
--- a/ext/phar/tests/delete_in_phar_b.phpt
+++ b/ext/phar/tests/delete_in_phar_b.phpt
diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt
index 1aaa30d630..1aaa30d630 100755..100644
--- a/ext/phar/tests/metadata_write.phpt
+++ b/ext/phar/tests/metadata_write.phpt
diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt
index fd2f10762a..fd2f10762a 100755..100644
--- a/ext/phar/tests/metadata_write_commit.phpt
+++ b/ext/phar/tests/metadata_write_commit.phpt
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index ef48906de1..ef48906de1 100755..100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index f64d538ef6..f64d538ef6 100755..100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 45131c4892..45131c4892 100755..100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index d790051116..d790051116 100755..100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 9d3e38323e..9d3e38323e 100755..100644
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt
index dade4726d9..dade4726d9 100755..100644
--- a/ext/phar/tests/phar_offset_get_error.phpt
+++ b/ext/phar/tests/phar_offset_get_error.phpt
diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index 7a81bbb4b8..7a81bbb4b8 100755..100644
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 3754151d42..3754151d42 100755..100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index ccaf7c65f8..ccaf7c65f8 100755..100644
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index ba67749843..ba67749843 100755..100644
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index cb3f298728..cb3f298728 100755..100644
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 556c98ce0b..556c98ce0b 100755..100644
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index 788b11f1f8..788b11f1f8 100755..100644
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index 80d1ece0ca..80d1ece0ca 100755..100644
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index 6abd03ee30..6abd03ee30 100755..100644
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index 1d3ff73242..1d3ff73242 100755..100644
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index 36d9963a22..36d9963a22 100755..100644
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 80d8ed8dc4..80d8ed8dc4 100755..100644
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt
index 6d4c732862..6d4c732862 100755..100644
--- a/ext/phar/tests/phar_oo_compressed_001b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001b.phpt
diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt
index d4ec5cb720..d4ec5cb720 100755..100644
--- a/ext/phar/tests/phar_oo_compressed_002.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002.phpt
diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt
index d7213fdbaa..d7213fdbaa 100755..100644
--- a/ext/phar/tests/phar_oo_compressed_002b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002b.phpt
diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
index bb5d63bcf7..bb5d63bcf7 100755..100644
--- a/ext/phar/tests/phar_stub_error.phpt
+++ b/ext/phar/tests/phar_stub_error.phpt
diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt
index ecdb3b9b63..ecdb3b9b63 100755..100644
--- a/ext/phar/tests/phar_stub_write.phpt
+++ b/ext/phar/tests/phar_stub_write.phpt
diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt
index e4c8676816..e4c8676816 100755..100644
--- a/ext/phar/tests/phar_stub_write_file.phpt
+++ b/ext/phar/tests/phar_stub_write_file.phpt
diff --git a/ext/phar/tests/refcount1_5_2.phpt b/ext/phar/tests/refcount1_5_2.phpt
index bf2c2b76b3..bf2c2b76b3 100755..100644
--- a/ext/phar/tests/refcount1_5_2.phpt
+++ b/ext/phar/tests/refcount1_5_2.phpt
diff --git a/ext/phar/tests/rename_dir_and_mount.phpt b/ext/phar/tests/rename_dir_and_mount.phpt
index b74f47b91d..b74f47b91d 100755..100644
--- a/ext/phar/tests/rename_dir_and_mount.phpt
+++ b/ext/phar/tests/rename_dir_and_mount.phpt
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index fa631e6181..fa631e6181 100755..100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index aeb28b02b9..aeb28b02b9 100755..100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index 2ea557b8a0..2ea557b8a0 100755..100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index f7cbb3a9a8..f7cbb3a9a8 100755..100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index d18f32ed3b..d18f32ed3b 100755..100644
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt
index 61532b9b42..61532b9b42 100755..100644
--- a/ext/phar/tests/tar/phar_stub_error.phpt
+++ b/ext/phar/tests/tar/phar_stub_error.phpt
diff --git a/ext/phar/tests/tar/refcount1_5_2.phpt b/ext/phar/tests/tar/refcount1_5_2.phpt
index 18587d91ad..18587d91ad 100755..100644
--- a/ext/phar/tests/tar/refcount1_5_2.phpt
+++ b/ext/phar/tests/tar/refcount1_5_2.phpt
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index b997c68291..b997c68291 100755..100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 313ee4ab32..313ee4ab32 100755..100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index 96fd2e426e..96fd2e426e 100755..100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index ef580cb229..ef580cb229 100755..100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index dc59f2f3aa..dc59f2f3aa 100755..100644
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt
index dafb312cf2..dafb312cf2 100755..100644
--- a/ext/phar/tests/zip/phar_stub_error.phpt
+++ b/ext/phar/tests/zip/phar_stub_error.phpt
diff --git a/ext/phar/tests/zip/refcount1_5_2.phpt b/ext/phar/tests/zip/refcount1_5_2.phpt
index f3b2771f44..f3b2771f44 100755..100644
--- a/ext/phar/tests/zip/refcount1_5_2.phpt
+++ b/ext/phar/tests/zip/refcount1_5_2.phpt