From 410eacc1a9b50ec3cb6c5fc0ff252516d0c0a4f1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 13:21:24 +0100 Subject: [PATCH 1/3] Fix Bug #71089 No check to duplicate zend_extension --- Zend/zend_extensions.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 8321f1ce831..fbf1f327a6c 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -100,6 +100,14 @@ int zend_load_extension(const char *path) 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 - extension already loaded\n", new_extension->name); +/* See http://support.microsoft.com/kb/190351 */ #ifdef PHP_WIN32 fflush(stderr); #endif From d403a91c6fb1d91db6e363502ad96023b08f92f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 13:22:13 +0100 Subject: [PATCH 2/3] NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 3a2289546ac..595dd82bcb8 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2016, PHP 5.6.18 +- Core: + + . Fixed bug #71089 (No check to duplicate zend_extension). (Remi) + 17 Dec 2015, PHP 5.6.17 - Core: From 7a5c7e00cda34ecc5cfff8c614bbeab884aea282 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 13:23:21 +0100 Subject: [PATCH 3/3] NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index ed32b6cb971..7f45f980f70 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ PHP NEWS . Fixed bug #66909 (configure fails utf8_to_mutf7 test). (Michael Orlitzky) . Fixed bug #70781 (Extension tests fail on dynamic ext dependency). (Francois Laupretre) + . Fixed bug #71089 (No check to duplicate zend_extension). (Remi) - DBA: . Fixed key leak with invalid resource. (Laruence)