]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e665a07 437612f)
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)
commit197095c29ecd643a9d8c8187fa9e87a6d92ceacd
tree22efa8f0e8a187e8b18c0731284eae24e6c40121tree | snapshot
parente665a07ab9b784266eefa9af30d8a32fa199da0bcommit | diff
parent437612f65615a93fe338fd5c25acb82d3e81a6f7commit | diff
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)
Zend/zend.c diff1 | diff2 | blob | history
Zend/zend_compile.h diff1 | diff2 | blob | history
Zend/zend_execute_API.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.