GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[MEDIA] Fix headers when using x-static-delivery

Browse Source
This commit is contained in:
Diogo Cordeiro 2020-07-22 16:07:25 +01:00 committed by Diogo Peralta Cordeiro
parent 8b5be9fe1b
commit 2894eb9ed2
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/util/util.php
View File

@ -2724,12 +2724,20 @@ function common_get_preferred_php_upload_limit(): int
} }
/** /**
* Include $filepath in the response, for viewing and downloading. * Send a file to the client.
* *
* @param string $filepath
* @param string $mimetype
* @param string $filename
* @param string $disposition
* @param int $expires header browser cache expires in milliseconds (defaults to 30 days)
* @throws ServerException * @throws ServerException
*/ */
function common_send_file(string $filepath, string $mimetype, string $filename, string $disposition = 'inline'): void function common_send_file(string $filepath, string $mimetype, string $filename, string $disposition = 'inline', int $expires = 30 * 24 * 3600): void
{ {
header("Content-Type: {$mimetype}");
header("Content-Disposition: {$disposition}; filename=\"{$filename}\"");
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
if (is_string(common_config('site', 'x-static-delivery'))) { if (is_string(common_config('site', 'x-static-delivery'))) {
$tmp = explode(INSTALLDIR, $filepath); $tmp = explode(INSTALLDIR, $filepath);
$relative_path = end($tmp); $relative_path = end($tmp);
@ -2738,9 +2746,6 @@ function common_send_file(string $filepath, string $mimetype, string $filename,
header(common_config('site', 'x-static-delivery') . ": {$relative_path}"); header(common_config('site', 'x-static-delivery') . ": {$relative_path}");
} else { } else {
header("Content-Description: File Transfer"); header("Content-Description: File Transfer");
header("Content-Type: {$mimetype}");
header("Content-Disposition: {$disposition}; filename=\"{$filename}\"");
header('Expires: 0');
header('Content-Transfer-Encoding: binary'); header('Content-Transfer-Encoding: binary');
$filesize = filesize($filepath); $filesize = filesize($filepath);
@ -2752,7 +2757,7 @@ function common_send_file(string $filepath, string $mimetype, string $filename,
$ret = @readfile($filepath); $ret = @readfile($filepath);
} elseif ($ret === false) { if ($ret === false) {
http_response_code(404); http_response_code(404);
common_log(LOG_ERR, "Couldn't read file at {$filepath}."); common_log(LOG_ERR, "Couldn't read file at {$filepath}.");
} elseif ($ret !== $filesize) { } elseif ($ret !== $filesize) {
@ -2760,8 +2765,11 @@ function common_send_file(string $filepath, string $mimetype, string $filename,
common_log(LOG_ERR, "The lengths of the file as recorded on the DB (or on disk) for the file " . common_log(LOG_ERR, "The lengths of the file as recorded on the DB (or on disk) for the file " .
"{$filepath} differ from what was sent to the user ({$filesize} vs {$ret})."); "{$filepath} differ from what was sent to the user ({$filesize} vs {$ret}).");
} }
} else {
http_response_code(404);
common_log(LOG_ERR, "File doesn't exist at {$filepath}.");
}
} }
} }
function html_sprintf() function html_sprintf()