Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_API.c

dlclose() here is still evil because of our broken shutdown order. We need to not do that here, or fix the shutdown order to not unload code before we run module shutdown. On Fri, 24 Sep 2004 15:40:22 -0000, Anantha Kesari H Y <hyanantha@php.net> wrote: > hyanantha Fri Sep 24 11:40:22 2004 EDT > > Modified files: > /ZendEngine2 zend_API.c > Log: > selectively avoiding module cleanup code for apache 1 build and removing a duplicate code > > > http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.264&r2=1.265&ty=u > Index: ZendEngine2/zend_API.c > diff -u ZendEngine2/zend_API.c:1.264 ZendEngine2/zend_API.c:1.265 > --- ZendEngine2/zend_API.c:1.264 Wed Sep 22 10:31:21 2004 > +++ ZendEngine2/zend_API.c Fri Sep 24 11:40:22 2004 > @@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: zend_API.c,v 1.264 2004/09/22 14:31:21 hyanantha Exp $ */ > +/* $Id: zend_API.c,v 1.265 2004/09/24 15:40:22 hyanantha Exp $ */ > > #include "zend.h" > #include "zend_execute.h" > @@ -1498,13 +1498,7 @@ > } > > #if HAVE_LIBDL > -#ifdef NETWARE > -#ifdef APACHE_2_BUILD > - if (module->handle) { > - dlclose(module->handle); > - } > -#endif > -#else > +#if !(defined(NETWARE) && defined(APACHE_1_BUILD)) > if (module->handle) { > dlclose(module->handle); > } > > -- > Zend Engine CVS Mailing List (http://cvs.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >