Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: Fixed test
11 years ago · 8182f0ff2a
1 changed files with 2 additions and 0 deletions
--- a/Zend/tests/memory_get_peak_usage.phpt
+++ b/Zend/tests/memory_get_peak_usage.phpt
@ -2,6 +2,8 @@
 int memory_get_peak_usage ([ bool $real_usage = false ] );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
+--INI--
+memory_limit=-1
 --FILE--
 <?php
 var_dump($a = memory_get_peak_usage());