stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-03 21:50:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

#1954 - Skip buffer calls for unit tests of file_proxy and data_rest.

Browse Source 
Moved the "if (TEST_MODE)" statement before the buffer calls in file_proxy and data_rest.
This has no impact on normal use, but will make the unit tests more compatible with different server/PHP configurations.
Note: We do not have to skip setting the headers, which means we can build unit tests around them if we wish.
This commit is contained in:
shadlaws
2013-01-21 10:45:34 +01:00
parent d45a737779
commit 8436e16b2f
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/controllers/file_proxy.php
+12 -13
View File
@@ -147,22 +147,21 @@ class File_Proxy_Controller extends Controller {
header("Content-Type: $item->mime_type");
}
// Don't use Kohana::close_buffers(false) here because that only closes all the buffers
// that Kohana started. We want to close *all* buffers at this point because otherwise we're
// 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()) {
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;
}
}
if (TEST_MODE) {
return $file;
} else {
// Don't use Kohana::close_buffers(false) here because that only closes all the buffers
// that Kohana started. We want to close *all* buffers at this point because otherwise we're
// 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()) {
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);
}
}