com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS main/main.c
| From: | Stanislav Malyshev | Date: | Tue, 02 Sep 2014 21:18:05 +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-81384@lists.php.net to get a copy of this message | ||
Commit: 70f92aa97e75a9bfa6a0377f9ef0574efcbe6280
Author: Stanislav Malyshev <stas@php.net> Tue, 2 Sep 2014 14:16:17 -0700
Parents: af85eff5b6c77681e7e4f9440fa35dbe5c1529ae fe551c089a7d309e3fa08513f1d1e287141cd202
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=70f92aa97e75a9bfa6a0377f9ef0574efcbe6280
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "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 f6c0d4d,a20f11a..3b7a382
--- 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).