com php-src: Merge branch 'pull-request/770' into PHP-5.4: Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Sep 2014 19:11:42 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/770' into PHP-5.4: Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81342@lists.php.net to get a copy of this message | ||
Commit: 197095c29ecd643a9d8c8187fa9e87a6d92ceacd
Author: Stanislav Malyshev <stas@php.net> Mon, 1 Sep 2014 12:11:42 -0700
Parents: e665a07ab9b784266eefa9af30d8a32fa199da0b 437612f65615a93fe338fd5c25acb82d3e81a6f7
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=197095c29ecd643a9d8c8187fa9e87a6d92ceacd
Log:
Merge branch 'pull-request/770' into PHP-5.4
* pull-request/770:
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 Zend/zend.c
MM Zend/zend_compile.h
MM Zend/zend_execute_API.c
Diff: