]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/770' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:11:42 +0000 (12:11 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:11:42 +0000 (12:11 -0700)
* 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)

1  2 
Zend/zend.c
Zend/zend_compile.h
Zend/zend_execute_API.c

diff --cc Zend/zend.c
Simple merge
Simple merge
Simple merge