From: Derick Rethans <derick@php.net>
Date: Tue, 16 Mar 2004 22:27:57 +0000 (+0000)
Subject: - Replaced the exec_finished hook by the zend_post_deactive hook for
X-Git-Tag: php-5.0.0RC1RC2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ef3c8c74acae6c8955ec44ffc3966f848c84861;p=php

- 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 a301fa2806..942dcb1439 100644
--- 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 b44c282d9d..8ce1a33c69 100644
--- 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();