diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-13 05:06:08 -0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-13 05:06:08 -0800 |
| commit | 07b33992a2784bf9e3bbf1d46400c718e704a436 (patch) | |
| tree | b471eeb140033a9fcc17fee2d532d240eb0bdbae | |
| parent | 4171a8f6c631e3c34d1d070d553e7611b5474263 (diff) | |
| download | php-git-07b33992a2784bf9e3bbf1d46400c718e704a436.tar.gz | |
Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_API.c | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -3,6 +3,7 @@ PHP NEWS ?? Jan 2016 PHP 7.0.2 - Core: + . Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work). (Laruence) . Fixed bug #71092 (Segmentation fault with return type hinting). (Laruence) . Fixed bug memleak in header_register_callback. (Laruence) . Fixed bug #71067 (Local object in class method stays in memory for each diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 0e6d89fc8a..8dbd904897 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -25,6 +25,7 @@ #include "zend_execute.h" #include "zend_API.h" #include "zend_modules.h" +#include "zend_extensions.h" #include "zend_constants.h" #include "zend_exceptions.h" #include "zend_closures.h" @@ -2001,7 +2002,7 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module) / lcname = zend_string_alloc(name_len, 0); zend_str_tolower_copy(ZSTR_VAL(lcname), dep->name, name_len); - if (zend_hash_exists(&module_registry, lcname)) { + if (zend_hash_exists(&module_registry, lcname) || zend_get_extension(dep->name)) { zend_string_free(lcname); /* TODO: Check version relationship */ zend_error(E_CORE_WARNING, "Cannot load module '%s' because conflicting module '%s' is already loaded", module->name, dep->name); |