Merge branch 'PHP-5.3' into PHP-5.4

2025-08-15 21:48:51 +02:00 · 2012-10-09 13:29:51 +08:00 · 2012-10-09 13:29:51 +08:00 · e4a8fa6a15
commit e4a8fa6a15
parent 931571260b 6284ef112e
66 changed files with 0 additions and 0 deletions
--- a/Zend/zend_build.h
+++ b/Zend/zend_build.h
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
--- a/ext/dba/dba_db1.c
+++ b/ext/dba/dba_db1.c
--- a/ext/dba/dba_qdbm.c
+++ b/ext/dba/dba_qdbm.c
--- a/ext/dba/php_db1.h
+++ b/ext/dba/php_db1.h
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
--- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
--- a/ext/mbstring/oniguruma/enc/utf16_be.c
+++ b/ext/mbstring/oniguruma/enc/utf16_be.c
--- a/ext/mbstring/oniguruma/enc/utf16_le.c
+++ b/ext/mbstring/oniguruma/enc/utf16_le.c
--- a/ext/mbstring/oniguruma/enc/utf32_be.c
+++ b/ext/mbstring/oniguruma/enc/utf32_be.c
--- a/ext/mbstring/oniguruma/enc/utf32_le.c
+++ b/ext/mbstring/oniguruma/enc/utf32_le.c
--- a/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
--- a/ext/pdo/php_pdo.h
+++ b/ext/pdo/php_pdo.h
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
--- a/ext/pdo_mysql/php_pdo_mysql.h
+++ b/ext/pdo_mysql/php_pdo_mysql.h
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
--- a/ext/pdo_oci/pdo_oci.c
+++ b/ext/pdo_oci/pdo_oci.c
--- a/ext/pdo_oci/php_pdo_oci.h
+++ b/ext/pdo_oci/php_pdo_oci.h
--- a/ext/pdo_oci/php_pdo_oci_int.h
+++ b/ext/pdo_oci/php_pdo_oci_int.h
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
--- a/ext/pdo_odbc/php_pdo_odbc_int.h
+++ b/ext/pdo_odbc/php_pdo_odbc_int.h
--- a/ext/simplexml/php_simplexml_exports.h
+++ b/ext/simplexml/php_simplexml_exports.h
--- a/ext/simplexml/sxe.c
+++ b/ext/simplexml/sxe.c
--- a/ext/simplexml/sxe.h
+++ b/ext/simplexml/sxe.h
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
--- a/ext/spl/spl_engine.c
+++ b/ext/spl/spl_engine.c
--- a/ext/spl/spl_engine.h
+++ b/ext/spl/spl_engine.h
--- a/ext/spl/spl_exceptions.c
+++ b/ext/spl/spl_exceptions.c
--- a/ext/spl/spl_exceptions.h
+++ b/ext/spl/spl_exceptions.h
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
--- a/ext/spl/spl_observer.h
+++ b/ext/spl/spl_observer.h
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
--- a/main/php_streams.h
+++ b/main/php_streams.h
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
--- a/win32/globals.c
+++ b/win32/globals.c
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h