ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure no output buffering when downloading an archive.

This commit is contained in:
Isaac Connor 2020-04-03 15:33:28 -04:00
parent 4547332fad
commit 5d72e3b1b5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/views/archive.php
View File

@ -50,9 +50,13 @@ if ( $archivetype ) {
$filename_path = ZM_DIR_EXPORTS.'/'.$filename; $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
ZM\Logger::Debug("downloading archive from $filename_path"); ZM\Logger::Debug("downloading archive from $filename_path");
if ( is_readable($filename_path) ) { if ( is_readable($filename_path) ) {
while (ob_get_level()) {
ZM\Logger::Debug('Clearing ob');
ob_end_clean();
}
header("Content-type: application/$mimetype" ); header("Content-type: application/$mimetype" );
header("Content-Disposition: inline; filename=$filename"); header("Content-Disposition: inline; filename=$filename");
header('Content-Length: ' . filesize($filename_path) ); header('Content-Length: '.filesize($filename_path));
set_time_limit(0); set_time_limit(0);
if ( ! @readfile($filename_path) ) { if ( ! @readfile($filename_path) ) {
ZM\Error("Error sending $filename_path"); ZM\Error("Error sending $filename_path");
@ -61,11 +65,9 @@ if ( $archivetype ) {
ZM\Error("$filename_path does not exist or is not readable."); ZM\Error("$filename_path does not exist or is not readable.");
} }
} else { } else {
ZM\Error("Unsupported archive type specified. Supported archives are tar and zip"); ZM\Error('Unsupported archive type specified. Supported archives are tar and zip');
} }
} else { } else {
ZM\Error("No archive type given to archive.php. Please specify a tar or zip archive."); ZM\Error('No archive type given to archive.php. Please specify a tar or zip archive.');
} }
?> ?>