Browse Source
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
PHP-7.1.3
Joe Watkins
9 years ago
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
1 changed files with
2 additions and
1 deletions
-
sapi/phpdbg/phpdbg.c
|
|
|
@ -231,7 +231,6 @@ static PHP_MSHUTDOWN_FUNCTION(phpdbg) /* {{{ */ |
|
|
|
zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]); |
|
|
|
zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]); |
|
|
|
zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP]); |
|
|
|
zend_hash_destroy(&PHPDBG_G(file_sources)); |
|
|
|
zend_hash_destroy(&PHPDBG_G(seek)); |
|
|
|
zend_hash_destroy(&PHPDBG_G(registered)); |
|
|
|
phpdbg_destroy_watchpoints(); |
|
|
|
@ -2152,6 +2151,8 @@ phpdbg_out: |
|
|
|
wrapper->wops->stream_opener = PHPDBG_G(orig_url_wrap_php); |
|
|
|
} |
|
|
|
|
|
|
|
zend_hash_destroy(&PHPDBG_G(file_sources)); |
|
|
|
|
|
|
|
zend_try { |
|
|
|
php_module_shutdown(); |
|
|
|
} zend_end_try(); |
|
|
|
|
