Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

php: Implement file streaming #1179

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

php: Implement file streaming #1179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions tinyfilemanager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,18 +3186,17 @@ function fm_download_file($fileLocation, $fileName, $chunkSize = 1024)

if ($size == 0) {
fm_set_msg(lng('Zero byte file! Aborting download'), 'error');
$FM_PATH=FM_PATH; fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));

return (false);
$FM_PATH = FM_PATH;
fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
return false;
}

@ini_set('magic_quotes_runtime', 0);
$fp = fopen("$fileLocation", "rb");

$fp = fopen($fileLocation, "rb");
if ($fp === false) {
fm_set_msg(lng('Cannot open file! Aborting download'), 'error');
$FM_PATH=FM_PATH; fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
return (false);
$FM_PATH = FM_PATH;
fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
return false;
}

// headers
Expand Down Expand Up @@ -3233,13 +3232,16 @@ function fm_download_file($fileLocation, $fileName, $chunkSize = 1024)
header("Content-Range: bytes 0-$size2/$size");
header("Content-Length: " . $size);
}
$fileLocation = realpath($fileLocation);
while (ob_get_level()) ob_end_clean();
readfile($fileLocation);

while (!feof($fp) && !connection_aborted() && ($chunk = fread($fp, $chunkSize)) !== false) {
echo $chunk;
ob_flush();
flush();
}

fclose($fp);

return ((connection_status() == 0) and !connection_aborted());
return (connection_status() == 0 && !connection_aborted());
}

/**
Expand Down