diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-08 17:13:54 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-08 17:13:54 +0200 |
| commit | 2d847934edcf8f2ed5230926446bd543bcd81841 (patch) | |
| tree | 9dc181cc71f1a1018c99932fb547fcb44978fbdb | |
| parent | 5de404eb926f0905fd9bae938939dbb4dadfd639 (diff) | |
| parent | 312ed18d1539d925b29d92bd481842131cd6d131 (diff) | |
| download | nextcloud-server-2d847934edcf8f2ed5230926446bd543bcd81841.tar.gz nextcloud-server-2d847934edcf8f2ed5230926446bd543bcd81841.zip | |
Merge pull request #10938 from owncloud/useSecureMimetype
Use secure mimetype for content delivery
| -rw-r--r-- | apps/files/download.php | 2 | ||||
| -rw-r--r-- | lib/private/files.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/download.php b/apps/files/download.php index 6b055e99a53..664a69c5959 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -34,7 +34,7 @@ if(!\OC\Files\Filesystem::file_exists($filename)) { exit; } -$ftype=\OC\Files\Filesystem::getMimeType( $filename ); +$ftype=\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); header('Content-Type:'.$ftype); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); diff --git a/lib/private/files.php b/lib/private/files.php index 739dae64180..06fc2dc9109 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -49,7 +49,7 @@ class OC_Files { header('Content-Type: application/zip'); } else { $filesize = \OC\Files\Filesystem::filesize($filename); - header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename)); + header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename))); if ($filesize > -1) { header("Content-Length: ".$filesize); } |