diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:14:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:15:54 -0700 |
| commit | 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e (patch) | |
| tree | 5466875f719d4841abdad75188d9d3e80636c1e2 /ext/json/php_json.h | |
| parent | 21446cd7b6d91f323cbee1250b9f2d551edf9b9c (diff) | |
| parent | 30aceaf1a7cf9ef6f32806463212323c6ab89f09 (diff) | |
| download | php-git-4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e.tar.gz | |
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)
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions