Merge branch 'PHP-5.4'

66 files changed, 0 insertions, 0 deletions

diff --git a/Zend/zend_build.h b/Zend/zend_build.h
index 042f50e807..042f50e807 100755..100644
--- a/Zend/zend_build.h
+++ b/Zend/zend_build.h
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index aee0d612db..aee0d612db 100755..100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h
index e3e3629c5b..e3e3629c5b 100755..100644
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index d0572b25c6..d0572b25c6 100755..100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h
index dba05850a8..dba05850a8 100755..100644
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index 7c035f6c4a..7c035f6c4a 100755..100644
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
diff --git a/ext/dba/dba_db1.c b/ext/dba/dba_db1.c
index 08af439524..08af439524 100755..100644
--- a/ext/dba/dba_db1.c
+++ b/ext/dba/dba_db1.c
diff --git a/ext/dba/dba_qdbm.c b/ext/dba/dba_qdbm.c
index d72f6b9cbc..d72f6b9cbc 100755..100644
--- a/ext/dba/dba_qdbm.c
+++ b/ext/dba/dba_qdbm.c
diff --git a/ext/dba/php_db1.h b/ext/dba/php_db1.h
index c0bb5f08b4..c0bb5f08b4 100755..100644
--- a/ext/dba/php_db1.h
+++ b/ext/dba/php_db1.h
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 357f3cb034..357f3cb034 100755..100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 09f4243a01..09f4243a01 100755..100644
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
index 8f12feb47e..8f12feb47e 100755..100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
index a5e2d2fbef..a5e2d2fbef 100755..100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
index fcfac2b899..fcfac2b899 100755..100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
diff --git a/ext/mbstring/oniguruma/enc/utf16_be.c b/ext/mbstring/oniguruma/enc/utf16_be.c
index 1e909ebbf2..1e909ebbf2 100755..100644
--- a/ext/mbstring/oniguruma/enc/utf16_be.c
+++ b/ext/mbstring/oniguruma/enc/utf16_be.c
diff --git a/ext/mbstring/oniguruma/enc/utf16_le.c b/ext/mbstring/oniguruma/enc/utf16_le.c
index 5cc0759117..5cc0759117 100755..100644
--- a/ext/mbstring/oniguruma/enc/utf16_le.c
+++ b/ext/mbstring/oniguruma/enc/utf16_le.c
diff --git a/ext/mbstring/oniguruma/enc/utf32_be.c b/ext/mbstring/oniguruma/enc/utf32_be.c
index b4f822607c..b4f822607c 100755..100644
--- a/ext/mbstring/oniguruma/enc/utf32_be.c
+++ b/ext/mbstring/oniguruma/enc/utf32_be.c
diff --git a/ext/mbstring/oniguruma/enc/utf32_le.c b/ext/mbstring/oniguruma/enc/utf32_le.c
index 8f413bfc74..8f413bfc74 100755..100644
--- a/ext/mbstring/oniguruma/enc/utf32_le.c
+++ b/ext/mbstring/oniguruma/enc/utf32_le.c
diff --git a/ext/mbstring/oniguruma/regext.c b/ext/mbstring/oniguruma/regext.c
index b1b957b40c..b1b957b40c 100755..100644
--- a/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 108119a0bf..108119a0bf 100755..100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index e0a1c3ce2f..e0a1c3ce2f 100755..100644
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index acdc0dd90d..acdc0dd90d 100755..100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 31932eb3c2..31932eb3c2 100755..100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h
index bc01da2cf8..bc01da2cf8 100755..100644
--- a/ext/pdo/php_pdo.h
+++ b/ext/pdo/php_pdo.h
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index b9c46bae74..b9c46bae74 100755..100644
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h
index 9a7a64e9c3..9a7a64e9c3 100755..100644
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index aa7109b516..aa7109b516 100755..100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index fc5ec5135b..fc5ec5135b 100755..100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index ea69c3c11b..ea69c3c11b 100755..100644
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
diff --git a/ext/pdo_mysql/php_pdo_mysql.h b/ext/pdo_mysql/php_pdo_mysql.h
index 87c7956257..87c7956257 100755..100644
--- a/ext/pdo_mysql/php_pdo_mysql.h
+++ b/ext/pdo_mysql/php_pdo_mysql.h
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 0b6d7752d3..0b6d7752d3 100755..100644
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index cb920ab14a..cb920ab14a 100755..100644
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index da3542559f..da3542559f 100755..100644
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c
index a0a05839e6..a0a05839e6 100755..100644
--- a/ext/pdo_oci/pdo_oci.c
+++ b/ext/pdo_oci/pdo_oci.c
diff --git a/ext/pdo_oci/php_pdo_oci.h b/ext/pdo_oci/php_pdo_oci.h
index ae96edc7c8..ae96edc7c8 100755..100644
--- a/ext/pdo_oci/php_pdo_oci.h
+++ b/ext/pdo_oci/php_pdo_oci.h
diff --git a/ext/pdo_oci/php_pdo_oci_int.h b/ext/pdo_oci/php_pdo_oci_int.h
index 990225493f..990225493f 100755..100644
--- a/ext/pdo_oci/php_pdo_oci_int.h
+++ b/ext/pdo_oci/php_pdo_oci_int.h
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index ca2808c6f5..ca2808c6f5 100755..100644
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index e700ef8c3c..e700ef8c3c 100755..100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 72553c421c..72553c421c 100755..100644
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
diff --git a/ext/pdo_odbc/php_pdo_odbc_int.h b/ext/pdo_odbc/php_pdo_odbc_int.h
index e200d7ce63..e200d7ce63 100755..100644
--- a/ext/pdo_odbc/php_pdo_odbc_int.h
+++ b/ext/pdo_odbc/php_pdo_odbc_int.h
diff --git a/ext/simplexml/php_simplexml_exports.h b/ext/simplexml/php_simplexml_exports.h
index 2ff0765734..2ff0765734 100755..100644
--- a/ext/simplexml/php_simplexml_exports.h
+++ b/ext/simplexml/php_simplexml_exports.h
diff --git a/ext/simplexml/sxe.c b/ext/simplexml/sxe.c
index 2e9a5b7c2c..2e9a5b7c2c 100755..100644
--- a/ext/simplexml/sxe.c
+++ b/ext/simplexml/sxe.c
diff --git a/ext/simplexml/sxe.h b/ext/simplexml/sxe.h
index 4c39b9aa12..4c39b9aa12 100755..100644
--- a/ext/simplexml/sxe.h
+++ b/ext/simplexml/sxe.h
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index cd0086626f..cd0086626f 100755..100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 855a78c404..855a78c404 100755..100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 3c6b41edbc..3c6b41edbc 100755..100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h
index 909f4c97dc..909f4c97dc 100755..100644
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b86e68659d..b86e68659d 100755..100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h
index 96f5dd6cb7..96f5dd6cb7 100755..100644
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c
index d501f31435..d501f31435 100755..100644
--- a/ext/spl/spl_engine.c
+++ b/ext/spl/spl_engine.c
diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h
index db7affef80..db7affef80 100755..100644
--- a/ext/spl/spl_engine.h
+++ b/ext/spl/spl_engine.h
diff --git a/ext/spl/spl_exceptions.c b/ext/spl/spl_exceptions.c
index 570299a2a8..570299a2a8 100755..100644
--- a/ext/spl/spl_exceptions.c
+++ b/ext/spl/spl_exceptions.c
diff --git a/ext/spl/spl_exceptions.h b/ext/spl/spl_exceptions.h
index 8d3a58a30c..8d3a58a30c 100755..100644
--- a/ext/spl/spl_exceptions.h
+++ b/ext/spl/spl_exceptions.h
diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c
index b9fd5dc8b9..b9fd5dc8b9 100755..100644
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h
index 394de6ae9d..394de6ae9d 100755..100644
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 7b77cf5bb1..7b77cf5bb1 100755..100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h
index 4a2c999c30..4a2c999c30 100755..100644
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 4b8be82eee..4b8be82eee 100755..100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
diff --git a/ext/spl/spl_observer.h b/ext/spl/spl_observer.h
index bfee74f300..bfee74f300 100755..100644
--- a/ext/spl/spl_observer.h
+++ b/ext/spl/spl_observer.h
diff --git a/ext/standard/winver.h b/ext/standard/winver.h
index 7152d60811..7152d60811 100755..100644
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
diff --git a/main/php_streams.h b/main/php_streams.h
index 291fd0d0ae..291fd0d0ae 100755..100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c
index 7b568501ee..7b568501ee 100755..100644
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h
index c584ff8f84..c584ff8f84 100755..100644
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 81bf59446f..81bf59446f 100755..100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
diff --git a/win32/globals.c b/win32/globals.c
index b92fad9f2d..b92fad9f2d 100755..100644
--- a/win32/globals.c
+++ b/win32/globals.c
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index 1fcfb60365..1fcfb60365 100755..100644
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h