From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 20 Sep 2016 09:34:40 +0000 (+0300)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c16384ea25eddd8b68224fe0eeb82557bed5931;p=php

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()
---

3c16384ea25eddd8b68224fe0eeb82557bed5931
diff --cc Zend/zend_API.c
index 4c77aa9575,8202b9a505..81ab757940
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1855,11 -1805,9 +1855,11 @@@ ZEND_API int zend_startup_module_ex(zen
  }
  /* }}} */
  
 -static int zend_startup_module_int(zend_module_entry *module TSRMLS_DC) /* {{{ */
 +static int zend_startup_module_zval(zval *zv) /* {{{ */
  {
 -	return (zend_startup_module_ex(module TSRMLS_CC) == SUCCESS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 +	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;
  }
  /* }}} */