diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-09-20 12:34:40 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-09-20 12:34:40 +0300 |
| commit | 3c16384ea25eddd8b68224fe0eeb82557bed5931 (patch) | |
| tree | d36f8797ea394d493ba2ad231eccb3b76ba012c3 /Zend/zend_API.c | |
| parent | ba2d9e1ff112f783cb930eaff5a2ecbc358421df (diff) | |
| parent | 4dd70b6e2f40c0ad85bea761803f2aeeb8ef785a (diff) | |
| download | php-git-3c16384ea25eddd8b68224fe0eeb82557bed5931.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 4c77aa9575..81ab757940 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1859,7 +1859,7 @@ static int zend_startup_module_zval(zval *zv) /* {{{ */ { zend_module_entry *module = Z_PTR_P(zv); - return zend_startup_module_ex(module); + return (zend_startup_module_ex(module) == SUCCESS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; } /* }}} */ |