com php-src: Fixed zend extensions multipy-times loadable: Zend/zend_extensions.c

From: Date: Thu, 28 Aug 2014 07:13:57 +0000
Subject: com php-src: Fixed zend extensions multipy-times loadable: Zend/zend_extensions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81247@lists.php.net to get a copy of this message
Commit: 671caa625534d77e56599a990e5083f9bc0d0f5f Author: Xinchen Hui <laruence@php.net> Thu, 28 Aug 2014 15:13:57 +0800 Parents: 697472e3e1347da644e67ccbf06fc4d851537adc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=671caa625534d77e56599a990e5083f9bc0d0f5f Log: Fixed zend extensions multipy-times loadable Changed paths: M Zend/zend_extensions.c Diff: diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 4728434..7e63f19 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -105,6 +105,14 @@ int zend_load_extension(const char *path TSRMLS_DC) #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 + DL_UNLOAD(handle); + return FAILURE; } return zend_register_extension(new_extension, handle TSRMLS_CC);

« previous php.cvs (#81247) next »