diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:11:42 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-01 12:11:42 -0700 |
| commit | 197095c29ecd643a9d8c8187fa9e87a6d92ceacd (patch) | |
| tree | 22efa8f0e8a187e8b18c0731284eae24e6c40121 /sapi/cli/php_cli_server.c | |
| parent | e665a07ab9b784266eefa9af30d8a32fa199da0b (diff) | |
| parent | 437612f65615a93fe338fd5c25acb82d3e81a6f7 (diff) | |
| download | php-git-197095c29ecd643a9d8c8187fa9e87a6d92ceacd.tar.gz | |
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)
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions