diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | main/main.c | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -1,6 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? March 2004, PHP 5 Release Candidate 1 +- Replaced the exec_finished hook by the zend_post_deactive hook for + extensions. The new hook will be run after the symbol table and destructors + are run. (Derick) - Fixed possible crash when internal get_method() is not defined. (Andi) - Fixed calling methods using call_user_func() in conjunction with the array("Class","Method") syntax to use the scope of the PHP user function. diff --git a/main/main.c b/main/main.c index b44c282d9d..8ce1a33c69 100644 --- a/main/main.c +++ b/main/main.c @@ -1188,10 +1188,6 @@ void php_request_shutdown(void *dummy) EG(opline_ptr) = NULL; zend_try { - zend_exec_finished(TSRMLS_C); - } zend_end_try(); - - zend_try { php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1) TSRMLS_CC); } zend_end_try(); @@ -1221,6 +1217,10 @@ void php_request_shutdown(void *dummy) zend_deactivate(TSRMLS_C); zend_try { + zend_post_deactivate_modules(TSRMLS_C); + } zend_end_try(); + + zend_try { sapi_deactivate(TSRMLS_C); } zend_end_try(); |