Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"

diff --cc NEWS
index 27ab1b8899f3226f5bc03351b84a2f754f79b097,3b7a382038abc9dc2f498ceffec2bd78e9ed2cff..5ba8944b270b24f71a9e4ff20774e6273d43a574
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,59 -1,12 +1,57 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.17
 +
 +?? ??? 2014, PHP 5.6.1
  
  - Core:
 -  . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
 +  . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
    . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande)
    . Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande)
-   . Fixed bug #67644 (Memory corruption & crash during ob_start function
-     callback). (Stas)
    . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
 +  . Fixed bug #67938 (Segfault when extending interface method with variadic).
 +    (Nikita)
 +
 +- Fileinfo:
 +  . Fixed bug #67731 (finfo::file() returns invalid mime type
 +    for binary files). (Anatol)
 +
 +- GD:
 +  . Made fontFetch's path parser thread-safe. (Sara)
 +
 +- GMP:
 +  . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
 +    memory exhaustion). (Nikita)
 +  . Fixed bug #50175 (gmp_init() results 0 on given base and number starting
 +    with 0x or 0b). (Nikita)
 +  . Implemented gmp_import() and gmp_export(). (Leigh, Nikita)
 +
 +- MySQLi:
 +  . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
 +
 +- OpenSSL:
 +  . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
 +    (Daniel Lowrey)
 +
 +- DOM:
 +  . Made DOMNode::textContent writeable. (Tjerk)
 +
 +28 Aug 2014, PHP 5.6.0
 +
 +- Apache2 Handler SAPI:
 +  . Fixed Apache log issue caused by APR's lack of support for %zu
 +    (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
 +    (Jeff Trawick)
 +
 +- CLI server:
 +  . Added some MIME types to the CLI web server. (Chris Jones)
 +  . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
 +  . Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
 +    (Adam)
 +  . Fixed bug #67594 (Unable to access to apache_request_headers() elements).
 +    (Tjerk)
 +  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
 +    (Adam)
 +  . Fixed Bug #67406 (built-in web-server segfaults on startup). (Remi)
  
  - COM:
    . Fixed bug #41577 (DOTNET is successful once per server run)

diff --cc main/main.c
Simple merge