Fix zend_register_extension()

diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 50b3dd47e5e923e7dbb376a698e21a98d49c96c3..efd45b496af068d5298f1c5ae01f0768ffabee58 100644 (file)
--- 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;