diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:19:31 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:20:34 -0700 |
| commit | 57f82819e978e34b3f488eb9a00681174584f5f3 (patch) | |
| tree | faa8f8dbe9565ad94d82e8a0287a2ff7c9345d0c /sapi/cli/php_cli_server.c | |
| parent | f89b7ec38950e39b9bb1b566b6c567382c42248f (diff) | |
| parent | 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e (diff) | |
| download | php-git-57f82819e978e34b3f488eb9a00681174584f5f3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions