feat: first-class hybrid extensions

Author: morrisonlevi

Zend/zend_extensions.c

@@ -60,7 +60,7 @@ zend_result zend_load_extension(const char *path)
 #endif
 }
 
-zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
+zend_result zend_load_extension_handle_ex(DL_HANDLE handle, const char *path, bool unload_on_failure, bool silent)
 {
 #if ZEND_EXTENSIONS_SUPPORT
 	zend_extension *new_extension;
@@ -74,63 +74,83 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
 		new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "_zend_extension_entry");
 	}
 	if (!extension_version_info || !new_extension) {
-		fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		if (!silent) {
+			fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	}
 
 	/* allow extension to proclaim compatibility with any Zend version */
 	if (extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
 		if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
-					"The Zend Engine API version %d which is installed, is outdated.\n\n",
-					new_extension->name,
-					extension_version_info->zend_extension_api_no,
-					ZEND_EXTENSION_API_NO);
+			if (!silent) {
+				fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+						"The Zend Engine API version %d which is installed, is outdated.\n\n",
+						new_extension->name,
+						extension_version_info->zend_extension_api_no,
+						ZEND_EXTENSION_API_NO);
+			}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 			fflush(stderr);
 #endif
-			DL_UNLOAD(handle);
+			if (unload_on_failure) {
+				DL_UNLOAD(handle);
+			}
 			return FAILURE;
 		} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
-					"The Zend Engine API version %d which is installed, is newer.\n"
-					"Contact %s at %s for a later version of %s.\n\n",
-					new_extension->name,
-					extension_version_info->zend_extension_api_no,
-					ZEND_EXTENSION_API_NO,
-					new_extension->author,
-					new_extension->URL,
-					new_extension->name);
+			if (!silent) {
+				fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+						"The Zend Engine API version %d which is installed, is newer.\n"
+						"Contact %s at %s for a later version of %s.\n\n",
+						new_extension->name,
+						extension_version_info->zend_extension_api_no,
+						ZEND_EXTENSION_API_NO,
+						new_extension->author,
+						new_extension->URL,
+						new_extension->name);
+			}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 			fflush(stderr);
 #endif
-			DL_UNLOAD(handle);
+			if (unload_on_failure) {
+				DL_UNLOAD(handle);
+			}
 			return FAILURE;
 		}
 	} else if (strcmp(ZEND_EXTENSION_BUILD_ID, extension_version_info->build_id) &&
 	           (!new_extension->build_id_check || new_extension->build_id_check(ZEND_EXTENSION_BUILD_ID) != SUCCESS)) {
-		fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
-					new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
+		if (!silent) {
+			fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
+						new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	} else if (zend_get_extension(new_extension->name)) {
-		fprintf(stderr, "Cannot load %s - it was already loaded\n", new_extension->name);
+		if (!silent) {
+			fprintf(stderr, "Cannot load %s - it was already loaded\n", new_extension->name);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	}
 
@@ -146,6 +166,11 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
 #endif
 }
 
+zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
+{
+	return zend_load_extension_handle_ex(handle, path, true, false);
+}
+
 
 void zend_register_extension(zend_extension *new_extension, DL_HANDLE handle)
 {

Zend/zend_extensions.h

@@ -153,6 +153,7 @@ ZEND_API void zend_reset_internal_run_time_cache(void);
 
 BEGIN_EXTERN_C()
 ZEND_API zend_result zend_load_extension(const char *path);
+ZEND_API zend_result zend_load_extension_handle_ex(DL_HANDLE handle, const char *path, bool unload_on_failure, bool silent);
 ZEND_API zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path);
 ZEND_API void zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
 ZEND_API zend_extension *zend_get_extension(const char *extension_name);