Second attempt to fix #1821 - first attempt caused an infinite loop in some cases

when zlib.output_compression is enabled.

1 files changed, 6 insertions, 1 deletions

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 36c6bc2a..47def436 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -128,7 +128,12 @@ class File_Proxy_Controller extends Controller {
     // going to buffer up whatever file we're proxying (and it may be very large).  This may
     // affect embedding or systems with PHP's output_buffering enabled.
     while (ob_get_level()) {
-      ob_end_clean();
+      Kohana_Log::add("error","".print_r(ob_get_level(),1));
+      if (!@ob_end_clean()) {
+        // ob_end_clean() can return false if the buffer can't be removed for some reason
+        // (zlib output compression buffers sometimes cause problems).
+        break;
+      }
     }
 
     readfile($file);