diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-09-20 12:34:58 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-09-20 12:34:58 +0300 |
| commit | 64a8048c53984bf03baab948bdb1166eed7acc72 (patch) | |
| tree | 37dd309ca97445fa3b0e86e2569162fea09c4305 /Zend/zend_API.c | |
| parent | 474428943f0407052c72180e5b45a3f9259599c3 (diff) | |
| parent | 3c16384ea25eddd8b68224fe0eeb82557bed5931 (diff) | |
| download | php-git-64a8048c53984bf03baab948bdb1166eed7acc72.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 475e3a74e9..fe2bf3711b 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1855,7 +1855,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; } /* }}} */ |