diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-26 13:35:00 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-26 13:35:00 +0100 |
| commit | 468456e1688dda50c046d42fcdf3c570c6e4e50d (patch) | |
| tree | 2012a8e2ca94f39d55e85257d73baf4bb698e576 /lib/private | |
| parent | 7804d0445b54ed8c726cb15b2420d08d3edad6b9 (diff) | |
| parent | d4e5ef4f38a0b3c48537bc7e27a14563e76b6391 (diff) | |
| download | nextcloud-server-468456e1688dda50c046d42fcdf3c570c6e4e50d.tar.gz nextcloud-server-468456e1688dda50c046d42fcdf3c570c6e4e50d.zip | |
Merge pull request #14125 from dratini0/master
[nginx] Extending X-Accel-Redirect support
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/files.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 496ba1baff0..b7df99c7d70 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -161,11 +161,12 @@ 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); @@ -181,6 +182,11 @@ class OC_Files { } if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { + if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'])) { + $filename = $_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'] . \OC\Files\Filesystem::getLocalFile($filename); + } else { + $filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename; + } header("X-Accel-Redirect: " . $filename); } } |