diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-11-14 08:46:15 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-12-06 19:07:22 +0100 |
| commit | 14752454659968fcd7c561df5ddc81dcd015ff22 (patch) | |
| tree | 37f1ae7d333df06e18a3063f73f815cd540bff50 | |
| parent | 281bbf4bd4ca0b2e565db0fb846f19b2b58d045f (diff) | |
| download | nextcloud-server-14752454659968fcd7c561df5ddc81dcd015ff22.tar.gz nextcloud-server-14752454659968fcd7c561df5ddc81dcd015ff22.zip | |
XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
| -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)) { |