Skip to content

Commit 5d2e287

Browse files
committed
Merge branch 'PHP-7.0'
* PHP-7.0: NEWS NEWS Fix Bug #71089 No check to duplicate zend_extension
2 parents 18b97c9 + 7a5c7e0 commit 5d2e287

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Zend/zend_extensions.c

+8
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ int zend_load_extension(const char *path)
109109
/* See http://support.microsoft.com/kb/190351 */
110110
#ifdef ZEND_WIN32
111111
fflush(stderr);
112+
#endif
113+
DL_UNLOAD(handle);
114+
return FAILURE;
115+
} else if (zend_get_extension(new_extension->name)) {
116+
fprintf(stderr, "Cannot load %s - extension already loaded\n", new_extension->name);
117+
/* See http://support.microsoft.com/kb/190351 */
118+
#ifdef PHP_WIN32
119+
fflush(stderr);
112120
#endif
113121
DL_UNLOAD(handle);
114122
return FAILURE;

0 commit comments

Comments
 (0)