From: Stanislav Malyshev <stas@php.net>
Date: Tue, 2 Sep 2014 21:16:17 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70f92aa97e75a9bfa6a0377f9ef0574efcbe6280;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

70f92aa97e75a9bfa6a0377f9ef0574efcbe6280
diff --cc NEWS
index f6c0d4d415,a20f11a5ec..3b7a382038
--- a/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).