cvs: ZendEngine2 / zend_API.c
| From: | Anantha Kesari H Y | Date: | Wed, 22 Sep 2004 13:29:09 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3002@lists.php.net to get a copy of this message | ||
hyanantha Wed Sep 22 09:29:09 2004 EDT
Modified files:
/ZendEngine2 zend_API.c
Log:
When Apache is unloaded, it calls dlclose on all the PHP extensions
that are loaded in memory. In the case of Apache 1.3, this call is blocking indefinitely. As a
work around, this call is bypassed for Apache 1.3 build on NetWare only. This means that none of the
loaded PHP extensions are unloaded. They will have to be manually unloaded before re-loading the
Apache 1.3 again.
http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.262&r2=1.263&ty=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.262 ZendEngine2/zend_API.c:1.263
--- ZendEngine2/zend_API.c:1.262 Thu Sep 9 12:51:45 2004
+++ ZendEngine2/zend_API.c Wed Sep 22 09:29:08 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.262 2004/09/09 16:51:45 andi Exp $ */
+/* $Id: zend_API.c,v 1.263 2004/09/22 13:29:08 hyanantha Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -1498,9 +1498,17 @@
}
#if HAVE_LIBDL
+ #ifdef NETWARE
+ #ifdef APACHE_2_BUILD
if (module->handle) {
dlclose(module->handle);
}
+ #endif
+ #else
+ if (module->handle) {
+ dlclose(module->handle);
+ }
+ #endif
#endif
}