]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21446cd 30aceaf)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:14:57 +0000 (12:14 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Sep 2014 19:15:54 +0000 (12:15 -0700)
commit4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e
tree5466875f719d4841abdad75188d9d3e80636c1e2tree | snapshot
parent21446cd7b6d91f323cbee1250b9f2d551edf9b9ccommit | diff
parent30aceaf1a7cf9ef6f32806463212323c6ab89f09commit | diff
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)
NEWS diff1 | diff2 | blob | history
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.