diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-26 09:04:52 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-26 09:05:10 +0000 |
| commit | 306f55bef43f18bd0502dcd9f14089eec4a19d0d (patch) | |
| tree | 921018dadedc8636048447d7bf442ed905175273 /Zend/zend_execute_API.c | |
| parent | 4e3a4c119d2bdc349cb03a51dc08e2b67808dd34 (diff) | |
| parent | 2d339fa4d1e82c888e4f514a741eb7ac14055671 (diff) | |
| download | php-git-306f55bef43f18bd0502dcd9f14089eec4a19d0d.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index e6ee1b6d4d..d183e2b27d 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -346,6 +346,10 @@ void shutdown_executor(void) /* {{{ */ } zend_end_try(); zend_try { + clean_non_persistent_constants(); + } zend_end_try(); + + zend_try { zend_close_rsrc_list(&EG(regular_list)); } zend_end_try(); @@ -377,10 +381,6 @@ void shutdown_executor(void) /* {{{ */ } zend_end_try(); zend_try { - clean_non_persistent_constants(); - } zend_end_try(); - - zend_try { #if 0&&ZEND_DEBUG signal(SIGSEGV, original_sigsegv_handler); #endif |