Re: [ZEND-ENGINE-CVS] cvs: Zend(PHP_4_3) / zend.h zend_API.c

Yeah I think so too. Rasmus, did you just miss that or is it on purpose? Andi At 07:08 AM 1/11/2005 +0200, Jani Taskinen wrote:

On Mon, 10 Jan 2005, Rasmus Lerdorf wrote:

rasmus          Mon Jan 10 16:28:30 2005 EDT

 Modified files:              (Branch: PHP_4_3)
   /Zend        zend.h zend_API.c

Log: Fixed shared extensions on OSX. We were using zend_mh_bundle_load to load a shared extension, but dlclose() to unload it because it was hardcoded. This caused problems for extensions loaded from php.ini since the Apple linker does a symbol check on an unload and we hadn't properly unloaded the shared extensions when Apache unloaded the parent PHP shared library during its 2-pass load/unload/load startup routine. By fixing the DL_UNLOAD macro and un-hardcoding the dlclose() call this now works.

[snip]

diff -u Zend/zend_API.c:1.113.2.4 Zend/zend_API.c:1.113.2.5 --- Zend/zend_API.c:1.113.2.4 Mon Sep 22 00:22:06 2003

+++ Zend/zend_API.c     Mon Jan 10 16:28:30 2005

@@ -1131,7 +1131,7 @@ #if HAVE_LIBDL

        if (module->handle) {
-               dlclose(module->handle);
+               DL_UNLOAD(module->handle);
        }

#endif }

    What if HAVE_LIBDL is not defined?
    I think "|| HAVE_MACH_O_DYLD_H" needs to be added after HAVE_LIBDL..

    --Jani

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