[Pkg-owncloud-commits] [owncloud] 15/28: XSendfile and encryption don't work together

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 14752454659968fcd7c561df5ddc81dcd015ff22
Author: Bart Visscher <bartv at thisnet.nl>
Date:   Thu Nov 14 08:46:15 2013 +0100

    XSendfile and encryption don't work together
    
    The file on disk is encrypted, and not readable on client systems
---
 lib/private/files.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/files.php b/lib/private/files.php
index 8b8ff81..6ffa14c 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)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git