MDL-24368 prevent infinite loops when caching can not be disabled

diff --git a/admin/cron.php b/admin/cron.php
index eed68d3..5ea34e6 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -77,7 +77,10 @@ if (check_browser_version('MSIE')) {
 // no more headers and buffers
 @ob_implicit_flush(true);
 while(ob_get_level()) {
-    ob_end_clean();
+    if (!ob_end_clean()) {
+        // prevent infinite loop
+        break;
+    }
 }
 
 // execute the cron

diff --git a/admin/index.php b/admin/index.php
index b586bad..01e4057 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -41,7 +41,10 @@ if (version_compare(phpversion(), '5.2.0') < 0) {
 // try to flush everything all the time
 @ob_implicit_flush(true);
 while(ob_get_level()) {
-    ob_end_clean(); // ob_end_flush prevents sending of headers
+    if (!ob_end_clean()) {
+        // prevent infinite loop
+        break;
+    }
 }
 
 require('../config.php');