com php-src: Revert "fix crash in phpdbg shutdown process when opcache is loaded": sapi/phpdbg/phpdbg.c
| From: | Joe Watkins | Date: | Mon, 27 Feb 2017 19:21:10 +0000 |
| Subject: | com php-src: Revert "fix crash in phpdbg shutdown process when opcache is loaded": sapi/phpdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97186@lists.php.net to get a copy of this message | ||
Commit: c564924d31ffe8f5d7097b2fa1d18616b21cf56c
Author: Joe Watkins <krakjoe@php.net> Mon, 27 Feb 2017 19:21:10 +0000
Parents: 008fb28eafa3740b1e3696b1a5cf7566d493b97d
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c564924d31ffe8f5d7097b2fa1d18616b21cf56c
Log:
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
This reverts commit 008fb28eafa3740b1e3696b1a5cf7566d493b97d.
Changed paths:
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 37314e6..c407885 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -228,6 +228,7 @@ static PHP_RSHUTDOWN_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));
zend_hash_destroy(&PHPDBG_G(watchpoints));
@@ -2136,8 +2137,6 @@ 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();