Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src: (22 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  ...

26 files changed, 476 insertions, 205 deletions

diff --git a/NEWS b/NEWS
index 02fb131476..49980d1919 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,14 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2012, PHP 5.4.9
 
+- Fileinfo:
+  . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
+    (Anatoliy)
+
+- PCRE:
+  . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
+    (Dmitry, Laruence)
+
 ?? ??? 2012, PHP 5.4.8
 
 - CLI server:
@@ -60,8 +68,14 @@ PHP                                                                        NEWS
     SHA224, SHA256, SHA384, SHA512). (Mark Jones)
 
 - PDO:
+  . Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link,
+    DBQUOTEDIDENT, 1)). (Laruence)
   . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
     (Martin Osvald, Remi)
+    
+- PDO Firebird:
+  . Fixed bug #63214 (Large PDO Firebird Queries).
+    (james at kenjim dot com)
 
 - SOAP
   . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index a7358fa85d..136d2d8bef 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index 70e61122a8..25a66a197c 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -40,6 +40,8 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC)
 				TSRMLS_FETCH();
 
 				if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
+					/* break possible cycles */
+					Z_TYPE_P(zvalue) = IS_NULL;
 					zend_hash_destroy(zvalue->value.ht);
 					FREE_HASHTABLE(zvalue->value.ht);
 				}
diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h
index cee077bab4..6f52cbf572 100644
--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h
@@ -507,77 +507,77 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[576] = {
 	{ "NZ"                                , 0x038F1A },
 	{ "NZ-CHAT"                           , 0x039298 },
 	{ "Pacific/Apia"                      , 0x039580 },
-	{ "Pacific/Auckland"                  , 0x03961D },
-	{ "Pacific/Chatham"                   , 0x0399A9 },
-	{ "Pacific/Chuuk"                     , 0x039CA0 },
-	{ "Pacific/Easter"                    , 0x039CF9 },
-	{ "Pacific/Efate"                     , 0x03A057 },
-	{ "Pacific/Enderbury"                 , 0x03A11D },
-	{ "Pacific/Fakaofo"                   , 0x03A18B },
-	{ "Pacific/Fiji"                      , 0x03A1DC },
-	{ "Pacific/Funafuti"                  , 0x03A36F },
-	{ "Pacific/Galapagos"                 , 0x03A3B3 },
-	{ "Pacific/Gambier"                   , 0x03A42B },
-	{ "Pacific/Guadalcanal"               , 0x03A490 },
-	{ "Pacific/Guam"                      , 0x03A4E5 },
-	{ "Pacific/Honolulu"                  , 0x03A53B },
-	{ "Pacific/Johnston"                  , 0x03A5B2 },
-	{ "Pacific/Kiritimati"                , 0x03A604 },
-	{ "Pacific/Kosrae"                    , 0x03A66F },
-	{ "Pacific/Kwajalein"                 , 0x03A6CC },
-	{ "Pacific/Majuro"                    , 0x03A738 },
-	{ "Pacific/Marquesas"                 , 0x03A797 },
-	{ "Pacific/Midway"                    , 0x03A7FE },
-	{ "Pacific/Nauru"                     , 0x03A888 },
-	{ "Pacific/Niue"                      , 0x03A900 },
-	{ "Pacific/Norfolk"                   , 0x03A95E },
-	{ "Pacific/Noumea"                    , 0x03A9B3 },
-	{ "Pacific/Pago_Pago"                 , 0x03AA43 },
-	{ "Pacific/Palau"                     , 0x03AACC },
-	{ "Pacific/Pitcairn"                  , 0x03AB10 },
-	{ "Pacific/Pohnpei"                   , 0x03AB65 },
-	{ "Pacific/Ponape"                    , 0x03ABBA },
-	{ "Pacific/Port_Moresby"              , 0x03ABFF },
-	{ "Pacific/Rarotonga"                 , 0x03AC43 },
-	{ "Pacific/Saipan"                    , 0x03AD1F },
-	{ "Pacific/Samoa"                     , 0x03AD82 },
-	{ "Pacific/Tahiti"                    , 0x03AE0B },
-	{ "Pacific/Tarawa"                    , 0x03AE70 },
-	{ "Pacific/Tongatapu"                 , 0x03AEC4 },
-	{ "Pacific/Truk"                      , 0x03AF50 },
-	{ "Pacific/Wake"                      , 0x03AF95 },
-	{ "Pacific/Wallis"                    , 0x03AFE5 },
-	{ "Pacific/Yap"                       , 0x03B029 },
-	{ "Poland"                            , 0x03B06E },
-	{ "Portugal"                          , 0x03B44F },
-	{ "PRC"                               , 0x03B94B },
-	{ "PST8PDT"                           , 0x03B9FC },
-	{ "ROC"                               , 0x03BD4D },
-	{ "ROK"                               , 0x03BE65 },
-	{ "Singapore"                         , 0x03BF09 },
-	{ "Turkey"                            , 0x03BFC0 },
-	{ "UCT"                               , 0x03C3AD },
-	{ "Universal"                         , 0x03C3F1 },
-	{ "US/Alaska"                         , 0x03C435 },
-	{ "US/Aleutian"                       , 0x03C79E },
-	{ "US/Arizona"                        , 0x03CB04 },
-	{ "US/Central"                        , 0x03CB92 },
-	{ "US/East-Indiana"                   , 0x03D59C },
-	{ "US/Eastern"                        , 0x03D09D },
-	{ "US/Hawaii"                         , 0x03D806 },
-	{ "US/Indiana-Starke"                 , 0x03D877 },
-	{ "US/Michigan"                       , 0x03DBE8 },
-	{ "US/Mountain"                       , 0x03DF1F },
-	{ "US/Pacific"                        , 0x03E298 },
-	{ "US/Pacific-New"                    , 0x03E69D },
-	{ "US/Samoa"                          , 0x03EAA2 },
-	{ "UTC"                               , 0x03EB2B },
-	{ "W-SU"                              , 0x03EE22 },
-	{ "WET"                               , 0x03EB6F },
-	{ "Zulu"                              , 0x03F05C },
+	{ "Pacific/Auckland"                  , 0x03971C },
+	{ "Pacific/Chatham"                   , 0x039AA8 },
+	{ "Pacific/Chuuk"                     , 0x039D9F },
+	{ "Pacific/Easter"                    , 0x039DF8 },
+	{ "Pacific/Efate"                     , 0x03A156 },
+	{ "Pacific/Enderbury"                 , 0x03A21C },
+	{ "Pacific/Fakaofo"                   , 0x03A28A },
+	{ "Pacific/Fiji"                      , 0x03A2DB },
+	{ "Pacific/Funafuti"                  , 0x03A46E },
+	{ "Pacific/Galapagos"                 , 0x03A4B2 },
+	{ "Pacific/Gambier"                   , 0x03A52A },
+	{ "Pacific/Guadalcanal"               , 0x03A58F },
+	{ "Pacific/Guam"                      , 0x03A5E4 },
+	{ "Pacific/Honolulu"                  , 0x03A63A },
+	{ "Pacific/Johnston"                  , 0x03A6B1 },
+	{ "Pacific/Kiritimati"                , 0x03A703 },
+	{ "Pacific/Kosrae"                    , 0x03A76E },
+	{ "Pacific/Kwajalein"                 , 0x03A7CB },
+	{ "Pacific/Majuro"                    , 0x03A837 },
+	{ "Pacific/Marquesas"                 , 0x03A896 },
+	{ "Pacific/Midway"                    , 0x03A8FD },
+	{ "Pacific/Nauru"                     , 0x03A987 },
+	{ "Pacific/Niue"                      , 0x03A9FF },
+	{ "Pacific/Norfolk"                   , 0x03AA5D },
+	{ "Pacific/Noumea"                    , 0x03AAB2 },
+	{ "Pacific/Pago_Pago"                 , 0x03AB42 },
+	{ "Pacific/Palau"                     , 0x03ABCB },
+	{ "Pacific/Pitcairn"                  , 0x03AC0F },
+	{ "Pacific/Pohnpei"                   , 0x03AC64 },
+	{ "Pacific/Ponape"                    , 0x03ACB9 },
+	{ "Pacific/Port_Moresby"              , 0x03ACFE },
+	{ "Pacific/Rarotonga"                 , 0x03AD42 },
+	{ "Pacific/Saipan"                    , 0x03AE1E },
+	{ "Pacific/Samoa"                     , 0x03AE81 },
+	{ "Pacific/Tahiti"                    , 0x03AF0A },
+	{ "Pacific/Tarawa"                    , 0x03AF6F },
+	{ "Pacific/Tongatapu"                 , 0x03AFC3 },
+	{ "Pacific/Truk"                      , 0x03B04F },
+	{ "Pacific/Wake"                      , 0x03B094 },
+	{ "Pacific/Wallis"                    , 0x03B0E4 },
+	{ "Pacific/Yap"                       , 0x03B128 },
+	{ "Poland"                            , 0x03B16D },
+	{ "Portugal"                          , 0x03B54E },
+	{ "PRC"                               , 0x03BA4A },
+	{ "PST8PDT"                           , 0x03BAFB },
+	{ "ROC"                               , 0x03BE4C },
+	{ "ROK"                               , 0x03BF64 },
+	{ "Singapore"                         , 0x03C008 },
+	{ "Turkey"                            , 0x03C0BF },
+	{ "UCT"                               , 0x03C4AC },
+	{ "Universal"                         , 0x03C4F0 },
+	{ "US/Alaska"                         , 0x03C534 },
+	{ "US/Aleutian"                       , 0x03C89D },
+	{ "US/Arizona"                        , 0x03CC03 },
+	{ "US/Central"                        , 0x03CC91 },
+	{ "US/East-Indiana"                   , 0x03D69B },
+	{ "US/Eastern"                        , 0x03D19C },
+	{ "US/Hawaii"                         , 0x03D905 },
+	{ "US/Indiana-Starke"                 , 0x03D976 },
+	{ "US/Michigan"                       , 0x03DCE7 },
+	{ "US/Mountain"                       , 0x03E01E },
+	{ "US/Pacific"                        , 0x03E397 },
+	{ "US/Pacific-New"                    , 0x03E79C },
+	{ "US/Samoa"                          , 0x03EBA1 },
+	{ "UTC"                               , 0x03EC2A },
+	{ "W-SU"                              , 0x03EF21 },
+	{ "WET"                               , 0x03EC6E },
+	{ "Zulu"                              , 0x03F15B },
 };
 /* This is a generated file, do not modify */
-const unsigned char timelib_timezone_db_data_builtin[258208] = {
+const unsigned char timelib_timezone_db_data_builtin[258463] = {
 
 
 /* Africa/Abidjan */
@@ -8085,7 +8085,7 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = {
 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0, 
 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x96, 0xF3, 0xDC, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60, 
-0x50, 0x64, 0xBE, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
+0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, 
@@ -8142,7 +8142,7 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = {
 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0, 
 0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x95, 0xA2, 0x5C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0, 
-0x4E, 0x85, 0x06, 0x80, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x64, 0xE8, 0x80, 0x00, 0x01, 0x00, 0x01, 
+0x4E, 0x85, 0x06, 0x80, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01, 
 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
@@ -16559,14 +16559,30 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = {
 /* Pacific/Apia */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x57, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x91, 0x05, 0xFC, 0x00, 
+0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x91, 0x05, 0xFC, 0x00, 
 0xDA, 0x62, 0x04, 0x38, 0x4C, 0x9F, 0x27, 0xB0, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 
-0x4E, 0xFD, 0x8B, 0xA0, 0x4F, 0x77, 0x0D, 0xE0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0xFF, 
-0xFF, 0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, 
-0x09, 0xFF, 0xFF, 0x73, 0x60, 0x01, 0x0D, 0x00, 0x00, 0xC4, 0xE0, 0x01, 0x0D, 0x00, 0x00, 0xB6, 
-0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x57, 0x53, 0x54, 0x00, 
-0x57, 0x53, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x74, 0x38, 0x9A, 0x00, 0x0C, 0x9D, 0x2A, 0x00, 0x00, 0x00, 0x00, 
+0x4E, 0xFD, 0x8B, 0xA0, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, 
+0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, 
+0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, 
+0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, 
+0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, 
+0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, 
+0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, 
+0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, 
+0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, 
+0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, 
+0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, 
+0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, 
+0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, 
+0x7F, 0x68, 0xFA, 0xE0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 
+0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x09, 
+0xFF, 0xFF, 0x73, 0x60, 0x01, 0x0D, 0x00, 0x00, 0xC4, 0xE0, 0x01, 0x0D, 0x00, 0x00, 0xB6, 0xD0, 
+0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x57, 0x53, 0x54, 0x00, 0x57, 
+0x53, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x74, 0x38, 0x9A, 0x00, 0x0C, 0x9D, 0x2A, 0x00, 0x00, 0x00, 0x00, 
 
 /* Pacific/Auckland */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -18191,4 +18207,4 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = {
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 
 0x00, 0x00, 0x00, 0x00, };
 
-const timelib_tzdb timezonedb_builtin = { "2012.6", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2012.7", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index 46b87b56dc..873a12c2f4 100644
--- a/ext/fileinfo/config.w32
+++ b/ext/fileinfo/config.w32
@@ -4,22 +4,16 @@
 ARG_ENABLE("fileinfo", "fileinfo support", "no");
 
 if (PHP_FILEINFO != 'no') {
-	if (CHECK_HEADER_ADD_INCLUDE("dirent.h", "CFLAGS_FILEINFO") &&
-			CHECK_LIB("dirent_a.lib", "fileinfo", PHP_FILEINFO)) { 
-		LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
-				cdf.c cdf_time.c compress.c \
-				encoding.c fsmagic.c funcs.c \
-				is_tar.c magic.c print.c \
-				readcdf.c readelf.c softmagic.c";
+	LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
+			cdf.c cdf_time.c compress.c \
+			encoding.c fsmagic.c funcs.c \
+			is_tar.c magic.c print.c \
+			readcdf.c readelf.c softmagic.c";
 
-		if (VCVERS < 1500) {
-			ADD_FLAG('CFLAGS', '/Zm1000');
-		}
+	if (VCVERS < 1500) {
+		ADD_FLAG('CFLAGS', '/Zm1000');
+	}
 
-		EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
-		ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo");
-	} else {
-		WARNING("fileinfo not enabled; libraries and headers not found");
-		PHP_FILEINFO = "no";
-	} 
+	EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
+	ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo");
 }
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 15f6a6dadd..ecb178ffa9 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
---- libmagic.origin/apprentice.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/apprentice.c	2012-09-11 11:36:51.000000000 +0800
+--- libmagic.origin/apprentice.c	Sat Dec 17 18:17:18 2011
++++ libmagic/apprentice.c	Tue Oct 16 10:21:49 2012
 @@ -29,6 +29,8 @@
   * apprentice - make one pass through /etc/magic, learning its secrets.
   */
@@ -10,7 +10,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  #include "file.h"
  
  #ifndef	lint
-@@ -36,18 +38,34 @@
+@@ -36,18 +38,31 @@
  #endif	/* lint */
  
  #include "magic.h"
@@ -43,13 +43,11 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 -#ifdef QUICK
 -#include <sys/mman.h>
 -#endif
-+#ifndef PHP_WIN32
- #include <dirent.h>
-+#endif
+-#include <dirent.h>
  
  #define	EATAB {while (isascii((unsigned char) *l) && \
  		      isspace((unsigned char) *l))  ++l;}
-@@ -112,12 +130,10 @@
+@@ -112,12 +127,10 @@
  private int parse_strength(struct magic_set *, struct magic_entry *, const char *);
  private int parse_apple(struct magic_set *, struct magic_entry *, const char *);
  
@@ -62,7 +60,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  private struct {
  	const char *name;
  	size_t len;
-@@ -131,38 +147,7 @@
+@@ -131,38 +144,7 @@
  	{ NULL, 0, NULL }
  };
  
@@ -102,7 +100,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  
  static const struct type_tbl_s {
  	const char name[16];
-@@ -218,6 +203,10 @@
+@@ -218,6 +200,10 @@
  # undef XX_NULL
  };
  
@@ -113,7 +111,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  private int
  get_type(const char *l, const char **t)
  {
-@@ -275,15 +264,17 @@
+@@ -275,15 +261,17 @@
  		if (rv != 0)
  			return -1;
  		rv = apprentice_compile(ms, &magic, &nmagic, fn);
@@ -136,7 +134,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  		if (rv != 0)
  			return -1;
  	}
-@@ -295,11 +286,7 @@
+@@ -295,11 +283,7 @@
  		return -1;
  	}
  
@@ -149,7 +147,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  
  	ml->magic = magic;
  	ml->nmagic = nmagic;
-@@ -318,7 +305,6 @@
+@@ -318,7 +302,6 @@
  	}
  	
  	return 0;
@@ -157,7 +155,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  }
  
  protected void
-@@ -327,22 +313,18 @@
+@@ -327,22 +310,18 @@
  	if (p == NULL)
  		return;
  	switch (type) {
@@ -186,7 +184,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	default:
  		abort();
  	}
-@@ -355,23 +337,27 @@
+@@ -355,23 +334,27 @@
  	char *p, *mfn;
  	int file_err, errs = -1;
  	struct mlist *mlist;
@@ -223,7 +221,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	mlist->next = mlist->prev = mlist;
  
  	while (fn) {
-@@ -385,13 +371,13 @@
+@@ -385,13 +368,13 @@
  		fn = p;
  	}
  	if (errs == -1) {
@@ -240,7 +238,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	return mlist;
  }
  
-@@ -524,6 +510,7 @@
+@@ -524,6 +507,7 @@
  		abort();
  	}
  
@@ -248,7 +246,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	/*
  	 * Magic entries with no description get a bonus because they depend
  	 * on subsequent magic entries to print something.
-@@ -539,8 +526,8 @@
+@@ -539,8 +523,8 @@
  private int
  apprentice_sort(const void *a, const void *b)
  {
@@ -259,7 +257,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	size_t sa = apprentice_magic_strength(ma->mp);
  	size_t sb = apprentice_magic_strength(mb->mp);
  	if (sa == sb)
-@@ -671,12 +658,22 @@
+@@ -671,12 +655,22 @@
  load_1(struct magic_set *ms, int action, const char *fn, int *errs,
     struct magic_entry **marray, uint32_t *marraycount)
  {
@@ -286,7 +284,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  		if (errno != ENOENT)
  			file_error(ms, errno, "cannot read magic file `%s'",
  				   fn);
-@@ -684,9 +681,12 @@
+@@ -684,9 +678,12 @@
  		return;
  	}
  
@@ -302,7 +300,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  		if (len == 0) /* null line, garbage, etc */
  			continue;
  		if (line[len - 1] == '\n') {
-@@ -736,8 +736,7 @@
+@@ -736,8 +733,7 @@
  			break;
  		}
  	}
@@ -312,7 +310,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  }
  
  /*
-@@ -754,23 +753,19 @@
+@@ -754,23 +750,21 @@
  apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
      const char *fn, int action)
  {
@@ -325,8 +323,12 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 +	size_t files = 0, maxfiles = 0;
 +	char **filearr = NULL;
  	struct stat st;
- 	DIR *dir;
- 	struct dirent *d;
+-	DIR *dir;
+-	struct dirent *d;
++	php_stream *dir;
++	php_stream_dirent d;
++
++	TSRMLS_FETCH();
  
  	ms->flags |= MAGIC_CHECK;	/* Enable checks for parsed files */
  
@@ -341,28 +343,33 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	marraycount = 0;
  
  	/* print silly verbose header for USG compat. */
-@@ -778,14 +773,18 @@
+@@ -778,22 +772,26 @@
  		(void)fprintf(stderr, "%s\n", usg_hdr);
  
  	/* load directory or file */
 -	if (stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
+-		dir = opendir(fn);
 +        /* FIXME: Read file names and sort them to prevent
 +           non-determinism. See Debian bug #488562. */
 +	if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
-+        int mflen;
-+        char mfn[MAXPATHLEN];
- 		dir = opendir(fn);
++		int mflen;
++		char mfn[MAXPATHLEN];
++
++		dir = php_stream_opendir(fn, REPORT_ERRORS, NULL);
  		if (!dir) {
  			errs++;
  			goto out;
  		}
- 		while ((d = readdir(dir)) != NULL) {
+-		while ((d = readdir(dir)) != NULL) {
 -			if (asprintf(&mfn, "%s/%s", fn, d->d_name) < 0) {
-+			if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d->d_name)) < 0) {
++		while (php_stream_readdir(dir, &d)) {
++			if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d.d_name)) < 0) {
  				file_oomem(ms,
- 				    strlen(fn) + strlen(d->d_name) + 2);
+-				    strlen(fn) + strlen(d->d_name) + 2);
++				strlen(fn) + strlen(d.d_name) + 2);
  				errs++;
-@@ -793,7 +792,6 @@
+-				closedir(dir);
++				php_stream_closedir(dir);
  				goto out;
  			}
  			if (stat(mfn, &st) == -1 || !S_ISREG(st.st_mode)) {
@@ -375,7 +382,8 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  				    realloc(filearr, mlen))) == NULL) {
  					file_oomem(ms, mlen);
 -					free(mfn);
- 					closedir(dir);
+-					closedir(dir);
++					php_stream_closedir(dir);
  					errs++;
  					goto out;
  				}
@@ -383,7 +391,8 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 -			filearr[files++] = mfn;
 +			filearr[files++] = estrndup(mfn, (mflen > sizeof(mfn) - 1)? sizeof(mfn) - 1: mflen);
  		}
- 		closedir(dir);
+-		closedir(dir);
++		php_stream_closedir(dir);
  		qsort(filearr, files, sizeof(*filearr), cmpstrp);
  		for (i = 0; i < files; i++) {
  			load_1(ms, action, filearr[i], &errs, &marray,
@@ -512,7 +521,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	m->mimetype[0] = '\0';		/* initialise MIME type to none */
  	if (m->cont_level == 0)
  		++(*nmentryp);		/* make room for next */
-@@ -2195,56 +2180,69 @@
+@@ -2195,56 +2180,79 @@
  
  /*
   * handle a compiled file.
@@ -543,6 +552,16 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
 +		ret = 3;
 +		goto internal_loaded;
 +	}
++
++#ifdef PHP_WIN32
++	/* Don't bother on windows with php_stream_open_wrapper,
++	return to give apprentice_load() a chance. */
++	if (php_stream_stat_path_ex(fn, 0, &st, NULL) == SUCCESS) {
++               if (st.sb.st_mode & S_IFDIR) {
++                       goto error2;
++               }
++       }
++#endif
  
  	dbname = mkdbname(ms, fn, 0);
  	if (dbname == NULL)
@@ -605,7 +624,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	ptr = (uint32_t *)(void *)*magicp;
  	if (*ptr != MAGICNO) {
  		if (swap4(*ptr) != MAGICNO) {
-@@ -2259,35 +2257,55 @@
+@@ -2259,35 +2267,55 @@
  	else
  		version = ptr[1];
  	if (version != VERSIONNO) {
@@ -677,7 +696,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	return -1;
  }
  
-@@ -2301,42 +2319,49 @@
+@@ -2301,42 +2329,49 @@
  apprentice_compile(struct magic_set *ms, struct magic **magicp,
      uint32_t *nmagicp, const char *fn)
  {
@@ -738,7 +757,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  	return rv;
  }
  
-@@ -2349,6 +2374,7 @@
+@@ -2349,6 +2384,7 @@
  {
  	const char *p, *q;
  	char *buf;
@@ -746,7 +765,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  
  	if (strip) {
  		if ((p = strrchr(fn, '/')) != NULL)
-@@ -2370,14 +2396,14 @@
+@@ -2370,14 +2406,14 @@
  	q++;
  	/* Compatibility with old code that looked in .mime */
  	if (ms->flags & MAGIC_MIME) {
@@ -765,7 +784,7 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  
  	/* Compatibility with old code that looked in .mime */
  	if (strstr(p, ".mime") != NULL)
-@@ -2467,7 +2493,7 @@
+@@ -2467,7 +2503,7 @@
  	m->offset = swap4((uint32_t)m->offset);
  	m->in_offset = swap4((uint32_t)m->in_offset);
  	m->lineno = swap4((uint32_t)m->lineno);
@@ -775,8 +794,8 @@ diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
  		m->str_flags = swap4(m->str_flags);
  	}
 diff -u libmagic.origin/ascmagic.c libmagic/ascmagic.c
---- libmagic.origin/ascmagic.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/ascmagic.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/ascmagic.c	Sat Dec 17 18:17:18 2011
++++ libmagic/ascmagic.c	Tue Apr 10 09:46:33 2012
 @@ -139,10 +139,8 @@
  		/* malloc size is a conservative overestimate; could be
  		   improved, or at least realloced after conversion. */
@@ -801,8 +820,8 @@ diff -u libmagic.origin/ascmagic.c libmagic/ascmagic.c
  	return rv;
  }
 diff -u libmagic.origin/cdf.c libmagic/cdf.c
---- libmagic.origin/cdf.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/cdf.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/cdf.c	Mon Feb 20 23:35:29 2012
++++ libmagic/cdf.c	Tue Apr 10 09:46:33 2012
 @@ -43,7 +43,17 @@
  #include <err.h>
  #endif
@@ -865,8 +884,8 @@ diff -u libmagic.origin/cdf.c libmagic/cdf.c
  				(void)fprintf(stderr, "timestamp %s\n", buf);
  			} else {
 diff -u libmagic.origin/cdf.h libmagic/cdf.h
---- libmagic.origin/cdf.h	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/cdf.h	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/cdf.h	Fri Feb 17 06:28:31 2012
++++ libmagic/cdf.h	Tue Apr 10 09:46:34 2012
 @@ -35,7 +35,7 @@
  #ifndef _H_CDF_
  #define _H_CDF_
@@ -903,8 +922,8 @@ diff -u libmagic.origin/cdf.h libmagic/cdf.h
  void cdf_swap_header(cdf_header_t *);
  void cdf_unpack_header(cdf_header_t *, char *);
 diff -u libmagic.origin/cdf_time.c libmagic/cdf_time.c
---- libmagic.origin/cdf_time.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/cdf_time.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/cdf_time.c	Tue Dec 13 14:48:41 2011
++++ libmagic/cdf_time.c	Tue Apr 10 09:46:34 2012
 @@ -96,7 +96,7 @@
  }
  
@@ -962,8 +981,8 @@ diff -u libmagic.origin/cdf_time.c libmagic/cdf_time.c
  	static const char *ref = "Sat Apr 23 01:30:00 1977";
  	char *p, *q;
 diff -u libmagic.origin/compress.c libmagic/compress.c
---- libmagic.origin/compress.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/compress.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/compress.c	Sat Dec 17 18:17:18 2011
++++ libmagic/compress.c	Tue Apr 10 09:46:34 2012
 @@ -32,6 +32,7 @@
   *	uncompress(method, old, n, newch) - uncompress old into new, 
   *					    using method, return sizeof new
@@ -1124,10 +1143,9 @@ diff -u libmagic.origin/compress.c libmagic/compress.c
  }
 -#endif
 +#endif /* if PHP_FILEINFO_UNCOMPRESS */
-Only in libmagic: diff
 diff -u libmagic.origin/file.h libmagic/file.h
---- libmagic.origin/file.h	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/file.h	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/file.h	Tue Sep 20 17:30:14 2011
++++ libmagic/file.h	Mon Apr 23 17:58:54 2012
 @@ -33,11 +33,9 @@
  #ifndef __file_h__
  #define __file_h__
@@ -1285,22 +1303,24 @@ diff -u libmagic.origin/file.h libmagic/file.h
  size_t strlcat(char *dst, const char *src, size_t siz);
  #endif
  #ifndef HAVE_GETLINE
-@@ -500,4 +487,12 @@
- #define FILE_RCSID(id)
+@@ -498,6 +485,14 @@
  #endif
- 
+ #else
+ #define FILE_RCSID(id)
++#endif
++
 +#ifdef PHP_WIN32
 +#define FINFO_LSEEK_FUNC _lseek
 +#define FINFO_READ_FUNC _read
 +#else
 +#define FINFO_LSEEK_FUNC lseek
 +#define FINFO_READ_FUNC read
-+#endif
-+
+ #endif
+ 
  #endif /* __file_h__ */
 diff -u libmagic.origin/fsmagic.c libmagic/fsmagic.c
---- libmagic.origin/fsmagic.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/fsmagic.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/fsmagic.c	Tue Aug 23 10:57:10 2011
++++ libmagic/fsmagic.c	Tue Apr 10 09:46:34 2012
 @@ -59,27 +59,21 @@
  # define minor(dev)  ((dev) & 0xff)
  #endif
@@ -1511,10 +1531,10 @@ diff -u libmagic.origin/fsmagic.c libmagic/fsmagic.c
 -#else
 -			if (file_printf(ms, "block special") == -1)
 -				return -1;
--#endif
+ #endif
 -		}
 -		return 1;
- #endif
+-#endif
 -	/* TODO add code to handle V7 MUX and Blit MUX files */
 +
  #ifdef	S_IFIFO
@@ -1624,8 +1644,8 @@ diff -u libmagic.origin/fsmagic.c libmagic/fsmagic.c
  
  	/*
 diff -u libmagic.origin/funcs.c libmagic/funcs.c
---- libmagic.origin/funcs.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/funcs.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/funcs.c	Sat Dec 17 18:17:18 2011
++++ libmagic/funcs.c	Mon Apr 23 17:58:54 2012
 @@ -41,52 +41,42 @@
  #if defined(HAVE_WCTYPE_H)
  #include <wctype.h>
@@ -1920,8 +1940,8 @@ diff -u libmagic.origin/funcs.c libmagic/funcs.c
  }
 +
 diff -u libmagic.origin/magic.c libmagic/magic.c
---- libmagic.origin/magic.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/magic.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/magic.c	Thu May 26 03:27:59 2011
++++ libmagic/magic.c	Tue Apr 10 09:46:34 2012
 @@ -25,11 +25,6 @@
   * SUCH DAMAGE.
   */
@@ -2298,8 +2318,8 @@ diff -u libmagic.origin/magic.c libmagic/magic.c
  public const char *
  magic_error(struct magic_set *ms)
 diff -u libmagic.origin/magic.h libmagic/magic.h
---- libmagic.origin/magic.h	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/magic.h	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/magic.h	Sun Dec 18 15:54:43 2011
++++ libmagic/magic.h	Tue Apr 10 09:46:34 2012
 @@ -85,6 +85,7 @@
  
  const char *magic_getpath(const char *, int);
@@ -2317,9 +2337,9 @@ diff -u libmagic.origin/magic.h libmagic/magic.h
  int magic_errno(magic_t);
  
 diff -u libmagic.origin/print.c libmagic/print.c
---- libmagic.origin/print.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/print.c	2012-09-11 11:33:55.000000000 +0800
-@@ -29,6 +29,9 @@
+--- libmagic.origin/print.c	Tue Sep 20 17:28:09 2011
++++ libmagic/print.c	Tue Oct 16 10:13:39 2012
+@@ -29,12 +29,16 @@
   * print.c - debugging printout routines
   */
  
@@ -2329,7 +2349,14 @@ diff -u libmagic.origin/print.c libmagic/print.c
  #include "file.h"
  
  #ifndef lint
-@@ -46,174 +49,21 @@
+ FILE_RCSID("@(#)$File: print.c,v 1.71 2011/09/20 15:28:09 christos Exp $")
+ #endif  /* lint */
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+@@ -45,174 +49,21 @@
  
  #define SZOF(a)	(sizeof(a) / sizeof(a[0]))
  
@@ -2512,8 +2539,8 @@ diff -u libmagic.origin/print.c libmagic/print.c
  
  protected const char *
 diff -u libmagic.origin/readcdf.c libmagic/readcdf.c
---- libmagic.origin/readcdf.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/readcdf.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/readcdf.c	Mon Feb 20 21:04:58 2012
++++ libmagic/readcdf.c	Tue Apr 10 09:46:34 2012
 @@ -30,7 +30,11 @@
  #endif
  
@@ -2560,8 +2587,8 @@ diff -u libmagic.origin/readcdf.c libmagic/readcdf.c
                                          if ((ec = strchr(c, '\n')) != NULL)
                                                  *ec = '\0';
 diff -u libmagic.origin/readelf.c libmagic/readelf.c
---- libmagic.origin/readelf.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/readelf.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/readelf.c	Tue Aug 23 10:57:10 2011
++++ libmagic/readelf.c	Tue Apr 10 09:46:34 2012
 @@ -49,7 +49,7 @@
      off_t, int *, int);
  private int doshn(struct magic_set *, int, int, int, off_t, int, size_t,
@@ -2717,8 +2744,8 @@ diff -u libmagic.origin/readelf.c libmagic/readelf.c
  
  	if (fstat(fd, &st) == -1) {
 diff -u libmagic.origin/softmagic.c libmagic/softmagic.c
---- libmagic.origin/softmagic.c	2012-09-11 11:09:26.000000000 +0800
-+++ libmagic/softmagic.c	2012-09-11 11:33:55.000000000 +0800
+--- libmagic.origin/softmagic.c	Sat Dec 17 18:17:18 2011
++++ libmagic/softmagic.c	Fri May 25 09:59:25 2012
 @@ -41,6 +41,11 @@
  #include <stdlib.h>
  #include <time.h>
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index d11bd159a8..787eb79367 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -63,9 +63,6 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $")
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
-#ifndef PHP_WIN32
-#include <dirent.h>
-#endif
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
 		      isspace((unsigned char) *l))  ++l;}
@@ -759,8 +756,10 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 	size_t files = 0, maxfiles = 0;
 	char **filearr = NULL;
 	struct stat st;
-	DIR *dir;
-	struct dirent *d;
+	php_stream *dir;
+	php_stream_dirent d;
+
+	TSRMLS_FETCH();
 
 	ms->flags |= MAGIC_CHECK;	/* Enable checks for parsed files */
 
@@ -776,19 +775,20 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
         /* FIXME: Read file names and sort them to prevent
            non-determinism. See Debian bug #488562. */
 	if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
-        int mflen;
-        char mfn[MAXPATHLEN];
-		dir = opendir(fn);
+		int mflen;
+		char mfn[MAXPATHLEN];
+
+		dir = php_stream_opendir(fn, REPORT_ERRORS, NULL);
 		if (!dir) {
 			errs++;
 			goto out;
 		}
-		while ((d = readdir(dir)) != NULL) {
-			if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d->d_name)) < 0) {
+		while (php_stream_readdir(dir, &d)) {
+			if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d.d_name)) < 0) {
 				file_oomem(ms,
-				    strlen(fn) + strlen(d->d_name) + 2);
+				strlen(fn) + strlen(d.d_name) + 2);
 				errs++;
-				closedir(dir);
+				php_stream_closedir(dir);
 				goto out;
 			}
 			if (stat(mfn, &st) == -1 || !S_ISREG(st.st_mode)) {
@@ -801,14 +801,14 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 				if ((filearr = CAST(char **,
 				    realloc(filearr, mlen))) == NULL) {
 					file_oomem(ms, mlen);
-					closedir(dir);
+					php_stream_closedir(dir);
 					errs++;
 					goto out;
 				}
 			}
 			filearr[files++] = estrndup(mfn, (mflen > sizeof(mfn) - 1)? sizeof(mfn) - 1: mflen);
 		}
-		closedir(dir);
+		php_stream_closedir(dir);
 		qsort(filearr, files, sizeof(*filearr), cmpstrp);
 		for (i = 0; i < files; i++) {
 			load_1(ms, action, filearr[i], &errs, &marray,
@@ -2206,6 +2206,16 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 		goto internal_loaded;
 	}
 
+#ifdef PHP_WIN32
+	/* Don't bother on windows with php_stream_open_wrapper,
+	return to give apprentice_load() a chance. */
+	if (php_stream_stat_path_ex(fn, 0, &st, NULL) == SUCCESS) {
+               if (st.sb.st_mode & S_IFDIR) {
+                       goto error2;
+               }
+       }
+#endif
+
 	dbname = mkdbname(ms, fn, 0);
 	if (dbname == NULL)
 		goto error2;
diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
index df4ffe37e8..4f448f2b4a 100644
--- a/ext/gd/tests/bug43073.phpt
+++ b/ext/gd/tests/bug43073.phpt
@@ -1,9 +1,12 @@
 --TEST--
-Bug #43073 (TrueType bounding box is wrong for angle<>0)
+Bug #43073 (TrueType bounding box is wrong for angle<>0) freetype < 2.4.10
 --SKIPIF--
 <?php
 	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+
+	include dirname(__FILE__) . '/func.inc';
+	if(version_compare(get_freetype_version(), '2.4.10') >= 0) die('skip for freetype < 2.4.10');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43073_1.phpt b/ext/gd/tests/bug43073_1.phpt
new file mode 100644
index 0000000000..b69067d31b
--- /dev/null
+++ b/ext/gd/tests/bug43073_1.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Bug #43073 (TrueType bounding box is wrong for angle<>0) freetype >= 2.4.10
+--SKIPIF--
+<?php
+	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+
+	include dirname(__FILE__) . '/func.inc';
+	if(version_compare(get_freetype_version(), '2.4.10') == -1) die('skip for freetype >= 2.4.10');
+?>
+--FILE--
+<?php
+$cwd = dirname(__FILE__);
+$font = "$cwd/Tuffy.ttf";
+$delta_t = 360.0 / 16; # Make 16 steps around
+$g = imagecreate(800, 800);
+$bgnd  = imagecolorallocate($g, 255, 255, 255);
+$black = imagecolorallocate($g, 0, 0, 0);
+$x = 100;
+$y = 0;
+$cos_t = cos(deg2rad($delta_t));
+$sin_t = sin(deg2rad($delta_t));
+for ($angle = 0.0; $angle < 360.0; $angle += $delta_t) {
+  $bbox = imagettftext($g, 24, $angle, 400+$x, 400+$y, $black, $font, 'ABCDEF');
+  $s = vsprintf("(%d, %d), (%d, %d), (%d, %d), (%d, %d)\n", $bbox);
+  echo $s;
+  $temp = $cos_t * $x + $sin_t * $y;
+  $y    = $cos_t * $y - $sin_t * $x;
+  $x    = $temp;
+}
+imagepng($g, "$cwd/bug43073.png");
+?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug43073.png'); ?>
+--EXPECTF--
+(500, 400), (610, 400), (610, 376), (500, 376)
+(492, 363), (591, 322), (580, 295), (480, 336)
+(470, 331), (548, 254), (527, 233), (449, 310)
+(439, 309), (483, 202), (461, 193), (416, 299)
+(400, 300), (400, 183), (380, 183), (380, 300)
+(362, 307), (316, 195), (291, 205), (337, 318)
+(330, 329), (246, 244), (224, 265), (308, 350)
+(308, 360), (202, 316), (190, 344), (296, 388)
+(300, 400), (187, 400), (187, 425), (300, 425)
+(306, 437), (195, 483), (206, 510), (318, 464)
+(328, 469), (240, 557), (260, 578), (349, 491)
+(359, 491), (312, 607), (334, 616), (382, 501)
+(400, 500), (400, 618), (419, 618), (419, 500)
+(436, 493), (483, 607), (507, 597), (461, 482)
+(468, 471), (555, 558), (577, 538), (490, 450)
+(490, 440), (600, 485), (611, 457), (502, 412)
diff --git a/ext/gd/tests/bug48801.phpt b/ext/gd/tests/bug48801.phpt
index a6a9874ab8..fd25541a52 100644
--- a/ext/gd/tests/bug48801.phpt
+++ b/ext/gd/tests/bug48801.phpt
@@ -1,9 +1,12 @@
 --TEST--
-Bug #48801 (Problem with imagettfbbox)
+Bug #48801 (Problem with imagettfbbox) freetype < 2.4.10
 --SKIPIF--
 <?php
 	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+
+	include dirname(__FILE__) . '/func.inc';
+	if(version_compare(get_freetype_version(), '2.4.10') >= 0) die('skip for freetype < 2.4.10');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48801_1.phpt b/ext/gd/tests/bug48801_1.phpt
new file mode 100644
index 0000000000..11af80cd4b
--- /dev/null
+++ b/ext/gd/tests/bug48801_1.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.10
+--SKIPIF--
+<?php
+	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+
+	include dirname(__FILE__) . '/func.inc';
+	if(version_compare(get_freetype_version(), '2.4.10') == -1) die('skip for freetype >= 2.4.10');
+?>
+--FILE--
+<?php
+$cwd = dirname(__FILE__);
+$font = "$cwd/Tuffy.ttf";
+$bbox = imageftbbox(50, 0, $font, "image");
+echo '(' . $bbox[0] . ', ' . $bbox[1] . ")\n";
+echo '(' . $bbox[2] . ', ' . $bbox[3] . ")\n";
+echo '(' . $bbox[4] . ', ' . $bbox[5] . ")\n";
+echo '(' . $bbox[6] . ', ' . $bbox[7] . ")\n";
+?>
+--EXPECTF--
+(-1, 15)
+(156, 15)
+(156, -48)
+(-1, -48)
diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
new file mode 100644
index 0000000000..f17227eccd
--- /dev/null
+++ b/ext/gd/tests/func.inc
@@ -0,0 +1,61 @@
+<?php

+

+function get_gd_version()

+{

+	return GD_VERSION;

+}

+

+function get_php_info()

+{

+	ob_start();

+	phpinfo();

+	$info = ob_get_contents();

+	ob_end_clean();

+

+	return $info;

+}

+

+function get_freetype_version()

+{

+	$version = 0;

+	

+	if (preg_match(',FreeType Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) {

+		$version = $match[1];

+	}

+	

+	return $version;

+}

+

+function get_libjpeg_version()

+{

+	$version = 0;

+	

+	if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), $match)) {

+		$version = $match[1];

+	}

+	

+	return $version;

+}

+

+function get_libpng_version()

+{

+	$version = 0;

+	

+	if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) {

+		$version = $match[1];

+	}

+	

+	return $version;

+}

+

+function get_libxpm_version()

+{

+	$version = 0;

+	

+	if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) {

+		$version = $match[1];

+	}

+	

+	return $version;

+}

+

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index fa7a46f853..5968c43346 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -97,6 +97,13 @@ Note that the MySQL client library is not bundled anymore!])
   done
 
   if test -z "$MYSQL_LIB_DIR"; then
+    MYSQL_LIB_CHK(lib/x86_64-linux-gnu)
+  fi
+  if test -z "$MYSQL_LIB_DIR"; then
+    MYSQL_LIB_CHK(lib/i386-linux-gnu)
+  fi
+
+  if test -z "$MYSQL_LIB_DIR"; then
     AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
 Note that the MySQL client library is not bundled anymore!])
   fi
diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt
index 6489affc16..e07e041d2a 100644
--- a/ext/mysql/tests/mysql_field_flags.phpt
+++ b/ext/mysql/tests/mysql_field_flags.phpt
@@ -81,13 +81,17 @@ $tables = array(
 								array('label1', sprintf("'%s'", @date("Y-m-d H:i:s"))),
 								'label1' => array(
 										'timestamp',
-										'unsigned',
-										'zerofill',
 										'binary',
 										'not_null'),
 								),
 );
 
+if ($version < 560) {
+	$tables['label1 TIMESTAMP']['label1'][] = 'zerofill';
+	$tables['label1 TIMESTAMP']['label1'][] = 'unsigned';
+}
+
+
 foreach ($tables as $columns => $expected) {
 	if (!mysql_query("DROP TABLE IF EXISTS test", $link)) {
 		printf("[010/%s] [%d] %s\n", $columns, mysql_errno($link), mysql_error($link));
diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt
index 288c53f067..30a840a2a1 100644
--- a/ext/mysql/tests/mysql_stat.phpt
+++ b/ext/mysql/tests/mysql_stat.phpt
@@ -34,7 +34,7 @@ if ((!is_string($stat_def = mysql_stat())) || ('' === $stat_def))
 	printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
 		gettype($stat_def), $stat_def, mysql_errno(), mysql_error());
 
-assert($stat === $stat_def);
+assert(soundex($stat) === soundex($stat_def));
 
 mysql_close($link);
 
@@ -45,4 +45,4 @@ print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index b1c1e87a77..78540f1c33 100644
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -24,12 +24,12 @@ if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) {
 		die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
 	}
 }
-	
+
 
 if (empty($row))
 	die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
 
-if ($row[1] == 'NO')
+if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
 	die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
 
 $link->close();
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index 6000fce0a9..d03daaee88 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -29,7 +29,7 @@ if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) {
 if (empty($row))
 	die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
 
-if ($row[1] == 'NO')
+if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
 	die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
 
 $link->close();
@@ -41,7 +41,7 @@ $link->close();
 
 
 	$flags = MYSQLI_CLIENT_SSL;
-	
+
 	$link = mysqli_init();
 	mysqli_ssl_set($link, null, null, null, null, "RC4-MD5");
 	if (my_mysqli_real_connect($link, 'p:' . $host, $user, $passwd, $db, $port, null, $flags)) {
diff --git a/ext/mysqli/tests/bug55859.phpt b/ext/mysqli/tests/bug55859.phpt
index a8bb4b3f24..ba6e9902b3 100644
--- a/ext/mysqli/tests/bug55859.phpt
+++ b/ext/mysqli/tests/bug55859.phpt
@@ -12,9 +12,9 @@ require_once('skipifconnectfailure.inc');
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

 		printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

 	}

-	var_dump(mysqli_stat($link) === $link->stat);

+	var_dump(soundex(mysqli_stat($link)) === soundex($link->stat));

 	echo "done!";

 ?>

 --EXPECT--

 bool(true)

-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index c6d4e7cc32..df7d1c6580 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -211,7 +211,7 @@ require_once('skipifconnectfailure.inc');
 		$mysqli->sqlstate, gettype($mysqli->sqlstate),
 		mysqli_sqlstate($link), gettype(mysqli_sqlstate($link)));
 
-	assert(mysqli_stat($link) === $mysqli->stat);
+	assert(soundex(mysqli_stat($link)) == soundex($mysqli->stat));
 	printf("mysqli->stat = '%s'/%s ('%s'/%s)\n",
 		$mysqli->stat, gettype($mysqli->stat),
 		mysqli_stat($link), gettype(mysqli_stat($link)));
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index 42cbc1487f..8259d2f505 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -84,6 +84,8 @@ mysqli_close($link);
 		'VARCHAR(2) NOT NULL PRIMARY KEY' => 'NOT_NULL PRI_KEY NO_DEFAULT_VALUE PART_KEY'
 	);
 
+
+
 	function checkFlags($reported_flags, $expected_flags, $flags) {
 		$found_flags = $unexpected_flags = '';
 		foreach ($flags as $code => $name) {
@@ -104,6 +106,10 @@ mysqli_close($link);
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
+	if (mysqli_get_server_version($link) > 50600) {
+		$columns['TIMESTAMP NOT NULL'] = 'ON_UPDATE_NOW TIMESTAMP BINARY NOT_NULL';
+	}
+
 	foreach ($columns as $column_def => $expected_flags) {
 		if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
 			printf("[002] %s [%d] %s\n", $column_def,
diff --git a/ext/pcre/tests/bug63055.phpt b/ext/pcre/tests/bug63055.phpt
new file mode 100644
index 0000000000..16c50b54e5
--- /dev/null
+++ b/ext/pcre/tests/bug63055.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #63055 (Segfault in zend_gc with SF2 testsuite)
+--FILE--
+<?php
+/* the default gc root size is 10,000 */
+for ($i=0; $i<9998; $i++) {
+    $array = array();
+    $array[0] = &$array;
+    unset($array);
+}
+
+$matches = array("foo" => "bar"); /* this bucket will trigger the segfault */
+$dummy   = array("dummy");        /* used to trigger gc_collect_cycles */
+$dummy[1] = &$dummy;
+
+$matches[1] = &$matches;
+$matches[2] = $dummy;
+
+preg_match_all("/(\d)+/", "foo123456bar", $matches);
+echo "okey";
+?>
+--EXPECTF--
+okey
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 77832f9520..baf1dcc670 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -315,7 +315,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 	DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
 
 	/* allow double quoted indentifiers */
-	DBSETOPT(H->link, DBQUOTEDIDENT, 1);
+	DBSETOPT(H->link, DBQUOTEDIDENT, NULL);
 
 	if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
 		goto cleanup;
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index e39555fb97..9b0f596959 100644
--- a/ext/pdo_firebird/firebird_driver.c
+++ b/ext/pdo_firebird/firebird_driver.c
@@ -401,7 +401,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, long sql
 	long l, pindex = -1;
 		
 	/* Firebird allows SQL statements up to 64k, so bail if it doesn't fit */
-	if (sql_len > SHORT_MAX) {
+	if (sql_len > 65536) {
 		strcpy(dbh->error_code, "01004");
 		return 0;
 	}
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
index 3c21d0f321..4d0868ae7d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
@@ -23,7 +23,7 @@ $db = MySQLPDOTest::factory();
 		printf("[002] Wonderful, I can change the client version!\n");
 
 	$new_info = $db->getAttribute(PDO::ATTR_SERVER_INFO);
-	if ($new_info !== $info)
+	if (soundex($new_info) != soundex($info))
 		printf("[003] Did we change it from '%s' to '%s'?\n", $info, $info);
 
 	// lets hope we always run this in the same second as we did run the server info request...
diff --git a/ext/standard/tests/streams/bug63240.phpt b/ext/standard/tests/streams/bug63240.phpt
new file mode 100644
index 0000000000..7612c43745
--- /dev/null
+++ b/ext/standard/tests/streams/bug63240.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #63240: stream_get_line() return contains delimiter string
+--FILE--
+<?php
+$fd = fopen('php://temp', 'r+');
+$delimiter = 'MM';
+$str = str_repeat('.', 8191) . $delimiter . "rest";
+fwrite($fd, $str);
+rewind($fd);
+$line = stream_get_line($fd, 9000, $delimiter);
+var_dump(strlen($line));
+$line = stream_get_line($fd, 9000, $delimiter);
+var_dump($line);
+?>
+--EXPECT--
+int(8191)
+string(4) "rest"
diff --git a/main/streams/streams.c b/main/streams/streams.c
index e9c2e07320..21ca72c6b5 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1060,9 +1060,17 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re
 		if (has_delim) {
 			/* search for delimiter, but skip buffered_len (the number of bytes
 			 * buffered before this loop iteration), as they have already been
-			 * searched for the delimiter */
+			 * searched for the delimiter.
+			 * The left part of the delimiter may still remain in the buffer,
+			 * so subtract up to <delim_len - 1> from buffered_len, which is
+			 * the ammount of data we skip on this search  as an optimization
+			 */
 			found_delim = _php_stream_search_delim(
-				stream, maxlen, buffered_len, delim, delim_len TSRMLS_CC);
+				stream, maxlen,
+				buffered_len >= (delim_len - 1)
+						? buffered_len - (delim_len - 1)
+						: 0,
+				delim, delim_len TSRMLS_CC);
 			if (found_delim) {
 				break;
 			}