Merge branch 'PHP-5.4' into PHP-5.5

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

diff --cc NEWS
index f6c0d4d415fe135a297477b838be93409593fb4d,a20f11a5ec3682e1fa98209aecfeca798cb13847..3b7a382038abc9dc2f498ceffec2bd78e9ed2cff
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,17 -6,6 +6,15 @@@ PH
    . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
    . 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)
 +
 +- COM:
 +  . Fixed bug #41577 (DOTNET is successful once per server run)
 +    (Aidas Kasparas)
 +
 +- FPM:
 +  . Fixed #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable when
 +    using Apache). (David Zuelke)
  
  - OpenSSL:
    . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).

diff --cc main/main.c
Simple merge