com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Sep 2014 19:15:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81341@lists.php.net to get a copy of this message | ||
Commit: 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e
Author: Stanislav Malyshev <stas@php.net> Mon, 1 Sep 2014 12:14:57 -0700
Parents: 21446cd7b6d91f323cbee1250b9f2d551edf9b9c 30aceaf1a7cf9ef6f32806463212323c6ab89f09
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463, #66036)
Bugs:
https://bugs.php.net/65463
https://bugs.php.net/66036
Changed paths:
MM NEWS
MM Zend/zend.c
MM Zend/zend_compile.h
MM Zend/zend_execute_API.c
Diff:
diff --cc NEWS
index 459ecf8,a20f11a..3b7a382
--- a/NEWS
+++ b/NEWS
@@@ -4,15 -4,8 +4,17 @@@ PH
- Core:
. 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 #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).