diff options
author | Xinchen Hui <laruence@gmail.com> | 2016-01-26 15:57:39 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2016-01-26 15:57:39 +0800 |
commit | 9ff08ae17cc6092810268b647dd9966e33fdc0a6 (patch) | |
tree | 049c61b213802b7094fb5d51adb496766263e94c /Zend/zend.c | |
parent | 67c1921e2b01f298977c15e7352b6002ed175ea1 (diff) | |
download | php-git-9ff08ae17cc6092810268b647dd9966e33fdc0a6.tar.gz |
Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
Diffstat (limited to 'Zend/zend.c')
-rw-r--r-- | Zend/zend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 23fb9f2aba..eeeb2c6784 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -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(); @@ -984,10 +988,6 @@ ZEND_API void zend_deactivate(void) /* {{{ */ 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)); #endif - - zend_try { - zend_ini_deactivate(); - } zend_end_try(); } /* }}} */ |