summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 57573f4d30..53c08ae3c4 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -331,13 +331,6 @@ static void php_load_zend_extension_cb(void *arg)
#endif
if (IS_ABSOLUTE_PATH(filename, length)) {
-#ifdef PHP_WIN32
- char *err;
- if (!php_win32_image_compatible(filename, &err)) {
- php_error(E_CORE_WARNING, err);
- return;
- }
-#endif
zend_load_extension(filename);
} else {
DL_HANDLE handle;
@@ -381,13 +374,13 @@ static void php_load_zend_extension_cb(void *arg)
efree(orig_libpath);
efree(err1);
+ efree(libpath);
}
#ifdef PHP_WIN32
- if (!php_win32_image_compatible(libpath, &err1)) {
+ if (!php_win32_image_compatible(handle, &err1)) {
php_error(E_CORE_WARNING, err1);
efree(err1);
- efree(libpath);
DL_UNLOAD(handle);
return;
}