]> granicus.if.org Git - php/commitdiff
Fixed zend extensions multipy-times loadable
authorXinchen Hui <laruence@php.net>
Thu, 28 Aug 2014 07:13:57 +0000 (15:13 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 28 Aug 2014 07:13:57 +0000 (15:13 +0800)
Zend/zend_extensions.c

index 47284342faaa47996fa1858938a2b97298605b74..7e63f1925545a110d64d5c40d06d92663d5328bd 100644 (file)
@@ -100,6 +100,14 @@ int zend_load_extension(const char *path TSRMLS_DC)
                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 PHP_WIN32
+               fflush(stderr);
+#endif
+               DL_UNLOAD(handle);
+               return FAILURE;
+       } else if (zend_get_extension(new_extension->name)) {
+               fprintf(stderr, "Cannot load %s - it was already loade\n", new_extension->name);
+/* See http://support.microsoft.com/kb/190351 */
 #ifdef PHP_WIN32
                fflush(stderr);
 #endif