]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 481bf25 57f8281)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:22:41 +0000 (12:22 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:22:41 +0000 (12:22 -0700)
commitaaf5689f4d6e523fd78e0291dbbcd78f3ea988dc
treec841eb7205ba4e81fa187db65b264fa3e6322cbatree | snapshot
parent481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0dcommit | diff
parent57f82819e978e34b3f488eb9a00681174584f5f3commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  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)

Conflicts:
Zend/zend_compile.h
Zend/zend_execute_API.c
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.