From f2075f803fc59918cc20071cf174d6b5f81f5eed Mon Sep 17 00:00:00 2001 From: dratini0 Date: Tue, 30 Dec 2014 22:07:04 +0100 Subject: [PATCH 1/2] Fix: X-Accel-Redirect did not support custom data dir and local mounts --- lib/private/files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/files.php b/lib/private/files.php index 98f3c52d6c..d42ab3d185 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -182,7 +182,7 @@ class OC_Files { } if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { - $filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename; + $filename = \OC\Files\Filesystem::getLocalFile($filename); header("X-Accel-Redirect: " . $filename); } } From 31970ee7409ff2ed303b728ea4fd6f8d10302649 Mon Sep 17 00:00:00 2001 From: dratini0 Date: Tue, 30 Dec 2014 22:36:13 +0100 Subject: [PATCH 2/2] removed a little duplication --- lib/private/files.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/private/files.php b/lib/private/files.php index d42ab3d185..496ba1baff 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -161,12 +161,11 @@ class OC_Files { * @param false|string $filename */ private static function addSendfileHeader($filename) { + $filename = \OC\Files\Filesystem::getLocalFile($filename); if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) { - $filename = \OC\Files\Filesystem::getLocalFile($filename); header("X-Sendfile: " . $filename); } if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) { - $filename = \OC\Files\Filesystem::getLocalFile($filename); if (isset($_SERVER['HTTP_RANGE']) && preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) { $filelength = filesize($filename); @@ -182,7 +181,6 @@ class OC_Files { } if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { - $filename = \OC\Files\Filesystem::getLocalFile($filename); header("X-Accel-Redirect: " . $filename); } }