From: Zeev Suraski <zeev@php.net>
Date: Thu, 30 Mar 2000 18:06:41 +0000 (+0000)
Subject: Fix zend_register_extension()
X-Git-Tag: php-4.0RC2~567
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f6ad555430a64068354bf81fa108a49bebd91f4;p=php

Fix zend_register_extension()
---

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;