derick          Tue Mar 16 17:27:58 2004 EDT

  Modified files:              
    /php-src/main       main.c 
    /php-src    NEWS 
  Log:
  - 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)
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.598&r2=1.599&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.598 php-src/main/main.c:1.599
--- php-src/main/main.c:1.598   Tue Mar 16 14:49:18 2004
+++ php-src/main/main.c Tue Mar 16 17:27:56 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.598 2004/03/16 19:49:18 zeev Exp $ */
+/* $Id: main.c,v 1.599 2004/03/16 22:27:56 derick Exp $ */
 
 /* {{{ includes
  */
@@ -1188,10 +1188,6 @@
        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 @@
        zend_deactivate(TSRMLS_C);
 
        zend_try {
+               zend_post_deactivate_modules(TSRMLS_C);
+       } zend_end_try();
+
+       zend_try {
                sapi_deactivate(TSRMLS_C);
        } zend_end_try();
 
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1641&r2=1.1642&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1641 php-src/NEWS:1.1642
--- php-src/NEWS:1.1641 Tue Mar 16 16:47:27 2004
+++ php-src/NEWS        Tue Mar 16 17:27:57 2004
@@ -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.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to