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

diff --cc Zend/zend_API.c
index 4c77aa95752180efee154fd2b78e020d994fddba,8202b9a505299ef53812fe2ecd652c08f7cb3835..81ab75794071bbfae7a9b5f674376ce05b12fd81
--- 1/Zend/zend_API.c
--- 2/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;
  }
  /* }}} */