rasmus Sat May 21 14:26:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main main.c
Log:
Ah, never mind. Didn't notice a conflict on my last checkout. Jani's MFH
was fine.
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.16&r2=1.604.2.17&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.16 php-src/main/main.c:1.604.2.17
--- php-src/main/main.c:1.604.2.16 Sat May 21 14:11:17 2005
+++ php-src/main/main.c Sat May 21 14:26:27 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.604.2.16 2005/05/21 18:11:17 rasmus Exp $ */
+/* $Id: main.c,v 1.604.2.17 2005/05/21 18:26:27 rasmus Exp $ */
/* {{{ includes
*/
@@ -1197,6 +1197,10 @@
sapi_send_headers(TSRMLS_C);
} zend_end_try();
+ zend_try {
+ zend_call_destructors(TSRMLS_C);
+ } zend_end_try();
+
if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(TSRMLS_C);
} zend_end_try();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
