Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  minor loop optimizations, closes #2633

diff --cc ext/mysqli/mysqli.c
Simple merge

diff --cc ext/mysqli/mysqli_api.c
index 9f176c9fb0d2bc20d4684569840a51d1629dbd34,6793fc8065b04bef70e4b7a7e891f690b19b7e22..f0730839deb2a4d31c1ae3ba9d384f3ee70cb645
--- 1/ext/mysqli/mysqli_api.c
--- 2/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@@ -1266,12 -1267,8 +1267,12 @@@ PHP_FUNCTION(mysqli_fetch_lengths
  {
        MYSQL_RES               *result;
        zval                    *mysql_result;
-       unsigned int    i;
+       unsigned int    i, num_fields;
 -      zend_ulong      *ret;
 +#if defined(MYSQLI_USE_MYSQLND)
 +      const size_t    *ret;
 +#else
 +      const zend_ulong *ret;
 +#endif
  
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
                return;