diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 6696e7b3c2..9591a67c5b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -156,7 +156,7 @@ ZEND_API zend_utility_values zend_uv; /* version information */ static char *zend_version_info; static uint zend_version_info_length; -#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2015 Zend Technologies\n" +#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2016 Zend Technologies\n" #define PRINT_ZVAL_INDENT 4 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object) /* {{{ */ @@ -967,6 +967,10 @@ ZEND_API void zend_deactivate(void) /* {{{ */ shutdown_executor(); zend_try { + zend_ini_deactivate(); + } zend_end_try(); + + zend_try { shutdown_compiler(); } zend_end_try(); @@ -983,12 +987,7 @@ ZEND_API void zend_deactivate(void) /* {{{ */ fprintf(stderr, " Root Buffered buffer grey\n"); fprintf(stderr, " -------- -------- ----------- ------\n"); fprintf(stderr, "ZVAL %8d %8d %9d %8d\n", GC_G(zval_possible_root), GC_G(zval_buffered), GC_G(zval_remove_from_buffer), GC_G(zval_marked_grey)); - fprintf(stderr, "ZOBJ %8d %8d %9d %8d\n", GC_G(zobj_possible_root), GC_G(zobj_buffered), GC_G(zobj_remove_from_buffer), GC_G(zobj_marked_grey)); #endif - - zend_try { - zend_ini_deactivate(); - } zend_end_try(); } /* }}} */ |