From: Xinchen Hui Date: Tue, 9 Oct 2012 05:29:51 +0000 (+0800) Subject: Merge branch 'PHP-5.3' into PHP-5.4 X-Git-Tag: php-5.4.9RC1~21^2~12^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916;p=php Merge branch 'PHP-5.3' into PHP-5.4 --- e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 diff --cc Zend/zend_interfaces.c index aee0d612db,47dbe0b052..aee0d612db mode 100755,100644..100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c diff --cc Zend/zend_interfaces.h index e3e3629c5b,2b05bbd5a1..e3e3629c5b mode 100755,100644..100644 --- a/Zend/zend_interfaces.h +++ b/Zend/zend_interfaces.h diff --cc Zend/zend_iterators.c index d0572b25c6,1c5ba321de..d0572b25c6 mode 100755,100644..100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c diff --cc ext/com_dotnet/com_persist.c index 7c035f6c4a,fb940217e8..7c035f6c4a mode 100755,100644..100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c diff --cc ext/enchant/enchant.c index 357f3cb034,dcc39e267b..357f3cb034 mode 100755,100644..100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c diff --cc ext/pcntl/pcntl.c index 8647e105ef,b840066d99..8647e105ef mode 100755,100644..100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c diff --cc ext/pdo/pdo.c index e0a1c3ce2f,e1d8235b0b..e0a1c3ce2f mode 100755,100644..100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c diff --cc ext/pdo/pdo_dbh.c index acdc0dd90d,4035b2b910..acdc0dd90d mode 100755,100644..100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c diff --cc ext/pdo/pdo_stmt.c index 31932eb3c2,0cf0cf852a..31932eb3c2 mode 100755,100644..100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c diff --cc ext/pdo/php_pdo_driver.h index b9c46bae74,17b23a32ef..b9c46bae74 mode 100755,100644..100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h diff --cc ext/pdo_mysql/mysql_driver.c index 5cf35b1680,727357a03a..5cf35b1680 mode 100755,100644..100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c diff --cc ext/pdo_mysql/mysql_statement.c index fc5ec5135b,115e74c7dc..fc5ec5135b mode 100755,100644..100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c diff --cc ext/pdo_mysql/pdo_mysql.c index ea69c3c11b,e8e215fa39..ea69c3c11b mode 100755,100644..100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c diff --cc ext/pdo_mysql/php_pdo_mysql_int.h index 0b6d7752d3,f8caa9f6eb..0b6d7752d3 mode 100755,100644..100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h diff --cc ext/pdo_oci/oci_driver.c index cb920ab14a,b3aa7657ab..cb920ab14a mode 100755,100644..100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c diff --cc ext/pdo_odbc/pdo_odbc.c index 72553c421c,5c02f47a35..72553c421c mode 100755,100644..100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c diff --cc ext/spl/php_spl.c index cd0086626f,e2bd7cf281..cd0086626f mode 100755,100644..100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c diff --cc ext/spl/php_spl.h index 855a78c404,fb0765a81b..855a78c404 mode 100755,100644..100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h diff --cc ext/spl/spl_array.c index 3c6b41edbc,11540decd9..3c6b41edbc mode 100755,100644..100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c diff --cc ext/spl/spl_directory.c index b86e68659d,8c1810ef71..b86e68659d mode 100755,100644..100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c diff --cc ext/spl/spl_functions.c index b9fd5dc8b9,3a3cdcc708..b9fd5dc8b9 mode 100755,100644..100644 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c diff --cc ext/spl/spl_functions.h index 394de6ae9d,8cf98e55b3..394de6ae9d mode 100755,100644..100644 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h diff --cc ext/spl/spl_iterators.c index 098d7dc1e2,a46b7d4e48..098d7dc1e2 mode 100755,100644..100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c diff --cc ext/spl/spl_iterators.h index 4a2c999c30,525a25cc9e..4a2c999c30 mode 100755,100644..100644 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h diff --cc ext/spl/spl_observer.c index 4b8be82eee,85bbeec731..4b8be82eee mode 100755,100644..100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c diff --cc ext/standard/winver.h index 7152d60811,cb469a91c0..7152d60811 mode 100755,100644..100644 --- a/ext/standard/winver.h +++ b/ext/standard/winver.h diff --cc main/php_streams.h index 82498d6619,83b18c008b..82498d6619 mode 100755,100644..100644 --- a/main/php_streams.h +++ b/main/php_streams.h diff --cc main/streams/glob_wrapper.c index 7b568501ee,4a35153722..7b568501ee mode 100755,100644..100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c diff --cc main/streams/streams.c index e9c2e07320,dfd60940fc..e9c2e07320 mode 100755,100644..100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c