From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 26 Oct 2016 12:22:51 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4616441980b5c770c54bb809139810cb61824997;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)
---

4616441980b5c770c54bb809139810cb61824997
diff --cc NEWS
index d4ce1d3f2f,be6738ae74..98b6bef4be
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2016 PHP 7.0.14
 +?? ??? ????, PHP 7.1.0RC6
  
- 
+ - Core:
+   . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
+     / PDO). (Dmitry)
  
 -10 Nov 2016 PHP 7.0.13
 +27 Oct 2016, PHP 7.1.0RC5
  
  - Core:
    . Fixed bug #73350 (Exception::__toString() cause circular references).
diff --cc Zend/zend_alloc.c
index f52ce7985e,937340d9c9..a3003a457a
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@@ -850,7 -896,8 +850,8 @@@ static void *zend_mm_alloc_pages(zend_m
  #endif
  {
  	zend_mm_chunk *chunk = heap->main_chunk;
 -	int page_num, len;
 +	uint32_t page_num, len;
+ 	int steps = 0;
  
  	while (1) {
  		if (UNEXPECTED(chunk->free_pages < pages_count)) {