Merge pull request #954 from owncloud/download-progress-master
refs #933 send content length header - this will allow the browser to sh...
This commit is contained in:
commit
e73a47a824
|
@ -212,6 +212,7 @@ class OC_Files {
|
||||||
self::addSendfileHeader($filename);
|
self::addSendfileHeader($filename);
|
||||||
}else{
|
}else{
|
||||||
header('Content-Type: '.OC_Filesystem::getMimeType($filename));
|
header('Content-Type: '.OC_Filesystem::getMimeType($filename));
|
||||||
|
header("Content-Length: ".OC_Filesystem::filesize($filename));
|
||||||
$storage = OC_Filesystem::getStorage($filename);
|
$storage = OC_Filesystem::getStorage($filename);
|
||||||
if ($storage instanceof OC_Filestorage_Local) {
|
if ($storage instanceof OC_Filestorage_Local) {
|
||||||
self::addSendfileHeader(OC_Filesystem::getLocalFile($filename));
|
self::addSendfileHeader(OC_Filesystem::getLocalFile($filename));
|
||||||
|
@ -227,8 +228,6 @@ class OC_Files {
|
||||||
die('403 Forbidden');
|
die('403 Forbidden');
|
||||||
}
|
}
|
||||||
if($only_header) {
|
if($only_header) {
|
||||||
if(!$zip)
|
|
||||||
header("Content-Length: ".OC_Filesystem::filesize($filename));
|
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
if($zip) {
|
if($zip) {
|
||||||
|
|
Loading…
Reference in New Issue