From ace65a10f7c8d220adffa8e6f10ba225122dbbdc Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Tue, 28 Sep 2010 08:44:42 +0000
Subject: [PATCH] MDL-24368 disable compression on admin index and cron pages

---
 admin/cron.php  | 22 +++++++++++++---------
 admin/index.php |  7 ++++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/admin/cron.php b/admin/cron.php
index 5ea34e6489d..51b34aecc4d 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -45,6 +45,19 @@ require('../config.php');
 require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/cronlib.php');
 
+// disable compression, it would prevent closing of buffers
+if (ini_get('zlib.output_compression')) {
+    ini_set('zlib.output_compression', 'Off');
+}
+// no more headers and buffers
+ob_implicit_flush(true);
+while(ob_get_level()) {
+    if (!ob_end_clean()) {
+        // prevent infinite loop
+        break;
+    }
+}
+
 // extra safety
 session_get_instance()->write_close();
 
@@ -74,15 +87,6 @@ if (check_browser_version('MSIE')) {
     @header('Content-Type: text/plain; charset=utf-8');
 }
 
-// no more headers and buffers
-@ob_implicit_flush(true);
-while(ob_get_level()) {
-    if (!ob_end_clean()) {
-        // prevent infinite loop
-        break;
-    }
-}
-
 // execute the cron
 cron_run();
 
diff --git a/admin/index.php b/admin/index.php
index 01e4057829f..8ea4251d3d8 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -38,8 +38,13 @@ if (version_compare(phpversion(), '5.2.0') < 0) {
     die;
 }
 
+// disable compression, it would prevent closing of buffers
+if (ini_get('zlib.output_compression')) {
+    ini_set('zlib.output_compression', 'Off');
+}
+
 // try to flush everything all the time
-@ob_implicit_flush(true);
+ob_implicit_flush(true);
 while(ob_get_level()) {
     if (!ob_end_clean()) {
         // prevent infinite loop