mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-69355-master-filebuffer' of git://github.com/mudrd8mz/moodle into master

Browse Source
This commit is contained in:
Sara Arjona 2020-10-05 18:33:34 +02:00
commit 134c45e9ee
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/filelib.php
View File

@ -2234,23 +2234,27 @@ function readfile_accel($file, $mimetype, $accelerate) {
}
}
if ($filesize > 10000000) {
// for large files try to flush and close all buffers to conserve memory
while(@ob_get_level()) {
if (!@ob_end_flush()) {
break;
}
}
}
// Send this header after we have flushed the buffers so that if we fail
// later can remove this because it wasn't sent.
header('Content-Length: ' . $filesize);
if (!empty($_SERVER['REQUEST_METHOD']) and $_SERVER['REQUEST_METHOD'] === 'HEAD') {
exit;
}
while (ob_get_level()) {
$handlerstack = ob_list_handlers();
$activehandler = array_pop($handlerstack);
if ($activehandler === 'default output handler') {
// We do not expect any content in the buffer when we are serving files.
$buffercontents = ob_get_clean();
if ($buffercontents !== '') {
error_log('Non-empty default output handler buffer detected while serving the file ' . $file);
}
} else {
// Some handlers such as zlib output compression may have file signature buffered - flush it.
ob_end_flush();
}
}
// send the whole file content
if (is_object($file)) {
$file->readfile();