com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS Zend/zend_alloc.c

Commit: 4616441980b5c770c54bb809139810cb61824997 Author: Dmitry Stogov <dmitry@zend.com> Wed, 26 Oct 2016 15:22:51 +0300 Parents: 81f859b5ce74493d519863b42fda739c163283b7 3fb0a1a4e75f1049afe6f6950a4b7171b81ba8b0 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4616441980b5c770c54bb809139810cb61824997 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO) Bugs: https://bugs.php.net/72736 Changed paths: MM NEWS MM Zend/zend_alloc.c Diff: diff --cc NEWS index d4ce1d3,be6738a..98b6bef --- 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 f52ce79,937340d..a3003a4 --- 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)) {