From: Remi Collet <remi@php.net>
Date: Fri, 11 Dec 2015 12:22:55 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.2RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66398757fc87172b4532d06076e29dc0390a012e;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
---

66398757fc87172b4532d06076e29dc0390a012e
diff --cc Zend/zend_extensions.c
index bec776e68c,fbf1f327a6..399186a45d
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@@ -99,16 -100,16 +99,24 @@@ int zend_load_extension(const char *pat
  		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
 +#ifdef ZEND_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 loaded\n", new_extension->name);
 +/* See http://support.microsoft.com/kb/190351 */
 +#ifdef ZEND_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
  		DL_UNLOAD(handle);
  		return FAILURE;