- 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. (PHP part)

diff --git a/NEWS b/NEWS
index a301fa2806bb15df821c540ee80d0d1a7a00be4f..942dcb1439a46dde86eaadf29fb904fba564f79b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 b44c282d9d4fe62bc707962638ffcab9701a33f3..8ce1a33c69a31b10efe4d93c68730a590952c238 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1187,10 +1187,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();
@@ -1220,6 +1216,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();