Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: fix test for bug #60322
13 years ago · e74776266f
1 changed files with 4 additions and 1 deletions
--- a/tests/output/bug60322.phpt
+++ b/tests/output/bug60322.phpt
@ -1,8 +1,11 @@
 --TEST--
 Bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)
+--INI--
+output_buffering=128
 --FILE--
 <?php
-while(ob_get_clean()) ;
+ob_start();
+while(@ob_end_clean());
 var_dump(ob_get_clean());
 --EXPECT--
 bool(false)