Re: cvs: php4 /main main.c

On Tue, 25 Dec 2001, Markus Fischer wrote: > I didn't see an MFH for 4.1.1 for that. Isn't it needed there > (or did I oversee it?) You oversaw it: http://cvs.php.net/diff.php/php4/main/main.c?r1=1.404.2.4&r2=1.404.2.5&ty=h Derick > > - Markus > > On Sun, Dec 16, 2001 at 10:45:59PM -0000, Zeev Suraski wrote : > > zeev Sun Dec 16 17:45:59 2001 EDT > > > > Modified files: > > /php4/main main.c > > Log: > > Freeing that TLS is just too complicated. Since we're shutting > > down anyway, remove it for now (it did not exist in 4.0.6) > > > > > > Index: php4/main/main.c > > diff -u php4/main/main.c:1.415 php4/main/main.c:1.416 > > --- php4/main/main.c:1.415 Tue Dec 11 10:31:02 2001 > > +++ php4/main/main.c Sun Dec 16 17:45:57 2001 > > @@ -18,7 +18,7 @@ > > +----------------------------------------------------------------------+ > > */ > > > > -/* $Id: main.c,v 1.415 2001/12/11 15:31:02 sebastian Exp $ */ > > +/* $Id: main.c,v 1.416 2001/12/16 22:45:57 zeev Exp $ */ > > > > /* {{{ includes > > */ > > @@ -1001,9 +1001,7 @@ > > /* close down the ini config */ > > php_shutdown_config(); > > > > -#ifdef ZTS > > - ts_free_thread(); > > -#else > > +#ifndef ZTS > > zend_ini_shutdown(TSRMLS_C); > > shutdown_memory_manager(CG(unclean_shutdown), 1); > > #endif > > > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > > For additional commands, e-mail: php-cvs-help@lists.php.net > > To contact the list administrators, e-mail: php-list-admin@lists.php.net > > -- > Please always Cc to me when replying to me on the lists. > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > For additional commands, e-mail: php-cvs-help@lists.php.net > To contact the list administrators, e-mail: php-list-admin@lists.php.net >