com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS main/main.c
| From: | Stanislav Malyshev | Date: | Tue, 02 Sep 2014 19:32:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81381@lists.php.net to get a copy of this message | ||
Commit: af85eff5b6c77681e7e4f9440fa35dbe5c1529ae
Author: Stanislav Malyshev <stas@php.net> Tue, 2 Sep 2014 12:31:29 -0700
Parents: 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=af85eff5b6c77681e7e4f9440fa35dbe5c1529ae
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
Bugs:
https://bugs.php.net/67644
Changed paths:
MM NEWS
MM main/main.c
Diff:
diff --cc NEWS
index 3b7a382,ff6cde2...f6c0d4d
--- a/NEWS
+++ b/NEWS
@@@ -6,15 -6,8 +6,17 @@@ 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).