diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-11-14 08:46:15 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-12-06 17:59:59 +0100 |
| commit | 4c8bc61753dd26db1a239f8a6743c662d0d83dd4 (patch) | |
| tree | 1c9bda1e88caaa88fd86b0b17390835b52a779f0 /lib/private/files.php | |
| parent | 40f148cc6cb42ac24c04cff6dd4472d94cc1f097 (diff) | |
| download | nextcloud-server-4c8bc61753dd26db1a239f8a6743c662d0d83dd4.tar.gz nextcloud-server-4c8bc61753dd26db1a239f8a6743c662d0d83dd4.zip | |
XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
Diffstat (limited to 'lib/private/files.php')
| -rw-r--r-- | lib/private/files.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 8b8ff81ec5e..6ffa14c0d91 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -109,6 +109,9 @@ class OC_Files { $zip = false; $filename = $dir . '/' . $files; $name = $files; + if ($xsendfile && OC_App::isEnabled('files_encryption')) { + $xsendfile = false; + } } OC_Util::obEnd(); if ($zip or \OC\Files\Filesystem::isReadable($filename)) { |