Merge branch 'PHP-5.4'

diff --cc ext/mbstring/oniguruma/enc/utf16_be.c
index 1e909ebbf29307414503e49ba714dccf52e57e20,6ab80a6c1cea82ea5ed2bcc1135c45c5b4e9310e..1e909ebbf29307414503e49ba714dccf52e57e20
mode 100755,100644..100644
--- 1/ext/mbstring/oniguruma/enc/utf16_be.c
--- 2/ext/mbstring/oniguruma/enc/utf16_be.c
+++ b/ext/mbstring/oniguruma/enc/utf16_be.c

diff --cc ext/mbstring/oniguruma/enc/utf16_le.c
index 5cc07591173a01fdbe6316cea2495bd815fd0937,2248e4910fd9ef3c3824fb3223c0e5de61402d6f..5cc07591173a01fdbe6316cea2495bd815fd0937
mode 100755,100644..100644
--- 1/ext/mbstring/oniguruma/enc/utf16_le.c
--- 2/ext/mbstring/oniguruma/enc/utf16_le.c
+++ b/ext/mbstring/oniguruma/enc/utf16_le.c

diff --cc ext/mbstring/oniguruma/enc/utf32_be.c
index b4f822607c89467d98e697c8c0610cd4481c12fc,75133ca2626e1f518b0d59103d04ab071a52834d..b4f822607c89467d98e697c8c0610cd4481c12fc
mode 100755,100644..100644
--- 1/ext/mbstring/oniguruma/enc/utf32_be.c
--- 2/ext/mbstring/oniguruma/enc/utf32_be.c
+++ b/ext/mbstring/oniguruma/enc/utf32_be.c

diff --cc ext/mbstring/oniguruma/enc/utf32_le.c
index 8f413bfc74e12b1cfc8cabb8d3c284dcb67681cd,21dca10c115d21a43e7cbf02771bc7342ee2b681..8f413bfc74e12b1cfc8cabb8d3c284dcb67681cd
mode 100755,100644..100644
--- 1/ext/mbstring/oniguruma/enc/utf32_le.c
--- 2/ext/mbstring/oniguruma/enc/utf32_le.c
+++ b/ext/mbstring/oniguruma/enc/utf32_le.c

diff --cc ext/mbstring/oniguruma/regext.c
index b1b957b40c1b374fca1406737d22d0305f8c9b72,f5ad1f35a29e641a07a5c0c5729039f2f8ef364e..b1b957b40c1b374fca1406737d22d0305f8c9b72
mode 100755,100644..100644
--- 1/ext/mbstring/oniguruma/regext.c
--- 2/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c

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

diff --cc ext/pdo/php_pdo_int.h
index 9a7a64e9c39837420c72ecc353f619f5485fc6a2,16a8f0efb9dbaf606d62a3599fa8e8ec6eadb6d1..9a7a64e9c39837420c72ecc353f619f5485fc6a2
mode 100755,100644..100644
--- 1/ext/pdo/php_pdo_int.h
--- 2/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h

diff --cc ext/pdo_mysql/mysql_driver.c
index aa7109b51651c2aa0aec7948df18f58c8e4c07d6,5cf35b16800d995e433bd224a1b3ffffa1918dec..aa7109b51651c2aa0aec7948df18f58c8e4c07d6
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/spl/spl_iterators.c
index 7b77cf5bb1f58cea6c1dc2a757017b8123d74107,098d7dc1e29d130b9c5fc9ee3d63a75b1066569e..7b77cf5bb1f58cea6c1dc2a757017b8123d74107
mode 100755,100644..100644
--- 1/ext/spl/spl_iterators.c
--- 2/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c

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

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