From 5f6ad555430a64068354bf81fa108a49bebd91f4 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Thu, 30 Mar 2000 18:06:41 +0000 Subject: [PATCH] Fix zend_register_extension() --- Zend/zend_extensions.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 50b3dd47e5..efd45b496a 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -100,12 +100,6 @@ int zend_load_extension(char *path) return FAILURE; } - if (new_extension->startup) { - if (new_extension->startup(new_extension)!=SUCCESS) { - DL_UNLOAD(handle); - return FAILURE; - } - } return zend_register_extension(new_extension, handle); #else fprintf(stderr, "Extensions are not supported on this platform.\n"); @@ -118,6 +112,13 @@ int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle) { zend_extension extension; + if (new_extension->startup) { + if (new_extension->startup(new_extension)!=SUCCESS) { + DL_UNLOAD(handle); + return FAILURE; + } + } + extension = *new_extension; extension.handle = handle; -- 2.50.1