Merge branch 'PHP-5.3' into PHP-5.4

diff --cc Zend/zend_interfaces.c
index aee0d612db0832ae941d51f51a64f07791d7a0d2,47dbe0b05214960b55a4531731a005e9db2b4a7f..aee0d612db0832ae941d51f51a64f07791d7a0d2
mode 100755,100644..100644
--- 1/Zend/zend_interfaces.c
--- 2/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c

diff --cc Zend/zend_interfaces.h
index e3e3629c5ba92c018b321b976ea735e3054dc893,2b05bbd5a1a4718d44aed99a8faaf5a11092d645..e3e3629c5ba92c018b321b976ea735e3054dc893
mode 100755,100644..100644
--- 1/Zend/zend_interfaces.h
--- 2/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h

diff --cc Zend/zend_iterators.c
index d0572b25c61801102d287ba9665797c9f58a2e1c,1c5ba321de9748403627084d408f5a7f11a6b4c0..d0572b25c61801102d287ba9665797c9f58a2e1c
mode 100755,100644..100644
--- 1/Zend/zend_iterators.c
--- 2/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c

diff --cc ext/com_dotnet/com_persist.c
index 7c035f6c4abc4f8b236fcbb9ade939fa70697ff9,fb940217e87630c4d6684708ea71ef3395567a30..7c035f6c4abc4f8b236fcbb9ade939fa70697ff9
mode 100755,100644..100644
--- 1/ext/com_dotnet/com_persist.c
--- 2/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c

diff --cc ext/enchant/enchant.c
index 357f3cb0340d8cd484a81ee16ff3b26fb38a64b6,dcc39e267b2fa8b8f62aa6c5af4b4c6494c19468..357f3cb0340d8cd484a81ee16ff3b26fb38a64b6
mode 100755,100644..100644
--- 1/ext/enchant/enchant.c
--- 2/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c

diff --cc ext/pcntl/pcntl.c
index 8647e105ef919d9775a4dad06a0db2fdc7326bf6,b840066d990fe891f31ef1e959658f72d025ee6d..8647e105ef919d9775a4dad06a0db2fdc7326bf6
mode 100755,100644..100644
--- 1/ext/pcntl/pcntl.c
--- 2/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c

diff --cc ext/pdo/pdo.c
index e0a1c3ce2f5597d73e9dfed8665fe9d849b7b864,e1d8235b0b3b5f230520678972cdd61f039b2b34..e0a1c3ce2f5597d73e9dfed8665fe9d849b7b864
mode 100755,100644..100644
--- 1/ext/pdo/pdo.c
--- 2/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c

diff --cc ext/pdo/pdo_dbh.c
index acdc0dd90d6169b96b5cb50eac21cf8ded268d26,4035b2b910a132433b0d6a7a6c6b5f5a964ab8ec..acdc0dd90d6169b96b5cb50eac21cf8ded268d26
mode 100755,100644..100644
--- 1/ext/pdo/pdo_dbh.c
--- 2/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c

diff --cc ext/pdo/pdo_stmt.c
index 31932eb3c2a728439388cc004967d046dff6917c,0cf0cf852a6c64069fb0620dbbe93c3406fe972d..31932eb3c2a728439388cc004967d046dff6917c
mode 100755,100644..100644
--- 1/ext/pdo/pdo_stmt.c
--- 2/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c

diff --cc ext/pdo/php_pdo_driver.h
index b9c46bae7400210372a306c4cfd0c2d37a14c85a,17b23a32ef807719050da476c158d01fa0134f5d..b9c46bae7400210372a306c4cfd0c2d37a14c85a
mode 100755,100644..100644
--- 1/ext/pdo/php_pdo_driver.h
--- 2/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h

diff --cc ext/pdo_mysql/mysql_driver.c
index 5cf35b16800d995e433bd224a1b3ffffa1918dec,727357a03a47983944f341aa7f2629aa4239c426..5cf35b16800d995e433bd224a1b3ffffa1918dec
mode 100755,100644..100644
--- 1/ext/pdo_mysql/mysql_driver.c
--- 2/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c

diff --cc ext/pdo_mysql/mysql_statement.c
index fc5ec5135bd194b5356219dead5f36f55b747ce5,115e74c7dc4ab490a16f757175e71fc9df775529..fc5ec5135bd194b5356219dead5f36f55b747ce5
mode 100755,100644..100644
--- 1/ext/pdo_mysql/mysql_statement.c
--- 2/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c

diff --cc ext/pdo_mysql/pdo_mysql.c
index ea69c3c11b1d2197d4afbac3ed823071001cc934,e8e215fa392b5c92c1fc15509a56ad826d226ccd..ea69c3c11b1d2197d4afbac3ed823071001cc934
mode 100755,100644..100644
--- 1/ext/pdo_mysql/pdo_mysql.c
--- 2/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c

diff --cc ext/pdo_mysql/php_pdo_mysql_int.h
index 0b6d7752d33d1a74623c0bde06a745fbc472a58f,f8caa9f6ebfe77d72820d82412e744b80fe48c36..0b6d7752d33d1a74623c0bde06a745fbc472a58f
mode 100755,100644..100644
--- 1/ext/pdo_mysql/php_pdo_mysql_int.h
--- 2/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 cb920ab14a268886eeeecedd31b19098bc4921ae,b3aa7657ab11d2ec8546397d0562ea524c18848c..cb920ab14a268886eeeecedd31b19098bc4921ae
mode 100755,100644..100644
--- 1/ext/pdo_oci/oci_driver.c
--- 2/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c

diff --cc ext/pdo_odbc/pdo_odbc.c
index 72553c421c400dc2b8af85db6984e01d04b1e6f7,5c02f47a350fdeddc458542fca21d7dce5d87d61..72553c421c400dc2b8af85db6984e01d04b1e6f7
mode 100755,100644..100644
--- 1/ext/pdo_odbc/pdo_odbc.c
--- 2/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c

diff --cc ext/spl/php_spl.c
index cd0086626fc7d2373d0d48a2fe64ffd2982eb64d,e2bd7cf281c390d50826d18c8766b9ca6123c786..cd0086626fc7d2373d0d48a2fe64ffd2982eb64d
mode 100755,100644..100644
--- 1/ext/spl/php_spl.c
--- 2/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c

diff --cc ext/spl/php_spl.h
index 855a78c4047f89959fdf19191e382bada6e4234c,fb0765a81b4b94e43dbf71ddd14dce9426089268..855a78c4047f89959fdf19191e382bada6e4234c
mode 100755,100644..100644
--- 1/ext/spl/php_spl.h
--- 2/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h

diff --cc ext/spl/spl_array.c
index 3c6b41edbc975f4b7dd309f7aba5f18c3a4ec2b2,11540decd916d4cc2647d34142298e84c0c58718..3c6b41edbc975f4b7dd309f7aba5f18c3a4ec2b2
mode 100755,100644..100644
--- 1/ext/spl/spl_array.c
--- 2/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c

diff --cc ext/spl/spl_directory.c
index b86e68659dd651e2c5ab77fd297ad3f2adae922e,8c1810ef71d086a5881bcf744b67127d40fd76b5..b86e68659dd651e2c5ab77fd297ad3f2adae922e
mode 100755,100644..100644
--- 1/ext/spl/spl_directory.c
--- 2/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c

diff --cc ext/spl/spl_functions.c
index b9fd5dc8b9e50d28a237f75be46fe97688231ced,3a3cdcc7089c683a3d176e00a90067734ad1a18a..b9fd5dc8b9e50d28a237f75be46fe97688231ced
mode 100755,100644..100644
--- 1/ext/spl/spl_functions.c
--- 2/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c

diff --cc ext/spl/spl_functions.h
index 394de6ae9d70d6f489a57fc78f71f5a6346d0e7c,8cf98e55b3e24e46b637abbbc631bfc803651b68..394de6ae9d70d6f489a57fc78f71f5a6346d0e7c
mode 100755,100644..100644
--- 1/ext/spl/spl_functions.h
--- 2/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h

diff --cc ext/spl/spl_iterators.c
index 098d7dc1e29d130b9c5fc9ee3d63a75b1066569e,a46b7d4e48d4b3df606606413dfeb05a681dd580..098d7dc1e29d130b9c5fc9ee3d63a75b1066569e
mode 100755,100644..100644
--- 1/ext/spl/spl_iterators.c
--- 2/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c

diff --cc ext/spl/spl_iterators.h
index 4a2c999c30cae6d99195ad2fb2d83ec8da59d842,525a25cc9e22ec3abad0c911eb8ec2adc19c2842..4a2c999c30cae6d99195ad2fb2d83ec8da59d842
mode 100755,100644..100644
--- 1/ext/spl/spl_iterators.h
--- 2/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h

diff --cc ext/spl/spl_observer.c
index 4b8be82eee78d04f090f1f3d3bf35d36a2dccca1,85bbeec73192b5bf0d7e7130967f7ce47dc85f44..4b8be82eee78d04f090f1f3d3bf35d36a2dccca1
mode 100755,100644..100644
--- 1/ext/spl/spl_observer.c
--- 2/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c

diff --cc ext/standard/winver.h
index 7152d608115beaccc085c7de005a32167bf95ad3,cb469a91c0d82859b4867016a0b29875f7421d8a..7152d608115beaccc085c7de005a32167bf95ad3
mode 100755,100644..100644
--- 1/ext/standard/winver.h
--- 2/ext/standard/winver.h
+++ b/ext/standard/winver.h

diff --cc main/php_streams.h
index 82498d661901101dfcf946a10a7f364bcdf2f0d9,83b18c008be730815e84926a2a9ff89e435791d6..82498d661901101dfcf946a10a7f364bcdf2f0d9
mode 100755,100644..100644
--- 1/main/php_streams.h
--- 2/main/php_streams.h
+++ b/main/php_streams.h

diff --cc main/streams/glob_wrapper.c
index 7b568501ee735cd068385b5880933f449587a1f4,4a351537220a526a5c2f225911e81a0d582adcd5..7b568501ee735cd068385b5880933f449587a1f4
mode 100755,100644..100644
--- 1/main/streams/glob_wrapper.c
--- 2/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c

diff --cc main/streams/streams.c
index e9c2e0732002ceef37c69313e3b579e3d90c35b0,dfd60940fcaab096e1ca4dd3116b9050c3f2bb1c..e9c2e0732002ceef37c69313e3b579e3d90c35b0
mode 100755,100644..100644
--- 1/main/streams/streams.c
--- 2/main/streams/streams.c
+++ b/main/streams/streams.c