Re: cvs: php4 /main main.c

Only revert the php_request_shutdown_for_exec() the last two things are OK. I didn't see the second half. These are changes I know I made but they must have not saved :) Andi At 07:31 PM 2/26/2002 +0000, Sebastian Bergmann wrote:

sebastian               Tue Feb 26 14:31:24 2002 EDT

Modified files:

    /php4/main  main.c

Log: TSRM Cleanup. Index: php4/main/main.c diff -u php4/main/main.c:1.423 php4/main/main.c:1.424

--- php4/main/main.c:1.423      Tue Feb 26 13:59:27 2002
+++ php4/main/main.c    Tue Feb 26 14:31:21 2002

@@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: main.c,v 1.423 2002/02/26 18:59:27 andi Exp $ */ +/* $Id: main.c,v 1.424 2002/02/26 19:31:21 sebastian Exp $ */ /* {{{ includes */ @@ -696,10 +696,8 @@ /* {{{ php_request_shutdown_for_exec */ -void php_request_shutdown_for_exec(void *dummy) +void php_request_shutdown_for_exec(void *dummy TSRMLS_DC) {

-       TSRMLS_FETCH();

-

        /* used to close fd's in the 3..255 range here, but it's problematic
        */
        shutdown_memory_manager(1, 1 TSRMLS_CC);

@@ -744,7 +742,7 @@

        } zend_end_try();

        zend_try {
-               shutdown_memory_manager(CG(unclean_shutdown), 0);
+               shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
        } zend_end_try();

        zend_try {

@@ -1009,7 +1007,7 @@ #ifndef ZTS

        zend_ini_shutdown(TSRMLS_C);
-       shutdown_memory_manager(CG(unclean_shutdown), 1);
+       shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);

#endif

        module_initialized = 0;

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