diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
| commit | ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch) | |
| tree | 360c977fa1f03c2db397743988cd003e2321e44c /Zend/zend_extensions.c | |
| parent | 55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff) | |
| parent | 7302b72d6e6bb77446599ec29a3b89702a506025 (diff) | |
| download | php-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz | |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'Zend/zend_extensions.c')
| -rw-r--r-- | Zend/zend_extensions.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index bec776e68c..2cf68293ec 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -112,6 +112,14 @@ int zend_load_extension(const char *path) #endif DL_UNLOAD(handle); return FAILURE; + } else if (zend_get_extension(new_extension->name)) { + fprintf(stderr, "Cannot load %s - extension already loaded\n", new_extension->name); +/* See http://support.microsoft.com/kb/190351 */ +#ifdef PHP_WIN32 + fflush(stderr); +#endif + DL_UNLOAD(handle); + return FAILURE; } return zend_register_extension(new_extension, handle); |