L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-72582 core_files: Update readfile_accel error handling

Browse Source 
Correct the error handling in readfile_accel to properly log errors when
working on a stored_file, rather than hiding the true error behind the
incorrect "Object of class stored_file could not be converted to
string."

Co-authored-by: Simey Lameze <[email protected]>
Co-authored-by: Trisha Milan <[email protected]>
This commit is contained in:
Matt Rice
2025-07-07 18:40:15 +10:00
committed by Trisha Milan
co-authored by Simey Lameze Trisha Milan
parent a6b17d8f6b
commit 5f38019f3c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+16 -9
View File
@@ -2226,10 +2226,11 @@ function readfile_accel($file, $mimetype, $accelerate) {
header('Content-Type: '.$mimetype);
}
$lastmodified = is_object($file) ? $file->get_timemodified() : filemtime($file);
$isfileobj = is_object($file);
$lastmodified = $isfileobj ? $file->get_timemodified() : filemtime($file);
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
if (is_object($file)) {
if ($isfileobj) {
header('Etag: "' . $file->get_contenthash() . '"');
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) and trim($_SERVER['HTTP_IF_NONE_MATCH'], '"') === $file->get_contenthash()) {
header('HTTP/1.1 304 Not Modified');
@@ -2238,7 +2239,7 @@ function readfile_accel($file, $mimetype, $accelerate) {
}
// if etag present for stored file rely on it exclusively
if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) and (empty($_SERVER['HTTP_IF_NONE_MATCH']) or !is_object($file))) {
if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && (empty($_SERVER['HTTP_IF_NONE_MATCH']) || !$isfileobj)) {
// get unixtime of request header; clip extra junk off first
$since = strtotime(preg_replace('/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"]));
if ($since && $since >= $lastmodified) {
@@ -2254,7 +2255,7 @@ function readfile_accel($file, $mimetype, $accelerate) {
}
if ($accelerate) {
if (is_object($file)) {
if ($isfileobj) {
$fs = get_file_storage();
if ($fs->supports_xsendfile()) {
if ($fs->xsendfile_file($file)) {
@@ -2271,7 +2272,8 @@ function readfile_accel($file, $mimetype, $accelerate) {
}
}
$filesize = is_object($file) ? $file->get_filesize() : filesize($file);
$filesize = $isfileobj ? $file->get_filesize() : filesize($file);
$filename = $isfileobj ? $file->get_filename() : $file;
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
@@ -2305,10 +2307,10 @@ function readfile_accel($file, $mimetype, $accelerate) {
$ranges = false;
}
if ($ranges) {
if (is_object($file)) {
if ($isfileobj) {
$handle = $file->get_content_file_handle();
if ($handle === false) {
throw new file_exception('storedfilecannotreadfile', $file->get_filename());
throw new file_exception('storedfilecannotreadfile', $filename);
}
} else {
$handle = fopen($file, 'rb');
@@ -2334,7 +2336,12 @@ function readfile_accel($file, $mimetype, $accelerate) {
// 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);
// Include a preview of the first 20 characters of the output buffer to help identify
// what's causing it to be non-empty. This is useful for diagnosing unexpected output
// without exposing full content.
$buffercontentspreview = substr($buffercontents, 0, 20);
debugging("Non-empty default output handler buffer detected while serving the file {$filename}. " .
"Buffer contents (first 20 characters): {$buffercontentspreview}", DEBUG_DEVELOPER);
}
} else {
// Some handlers such as zlib output compression may have file signature buffered - flush it.
@@ -2343,7 +2350,7 @@ function readfile_accel($file, $mimetype, $accelerate) {
}
// send the whole file content
if (is_object($file)) {
if ($isfileobj) {
$file->readfile();
} else {
if (readfile_allow_large($file, $filesize) === false) {