]> source.dussan.org Git - nextcloud-server.git/commitdiff
Revert "removed a little duplication"
authordratini0 <dratini0@gmail.com>
Wed, 11 Feb 2015 20:14:58 +0000 (21:14 +0100)
committerdratini0 <dratini0@gmail.com>
Wed, 11 Feb 2015 21:19:22 +0000 (22:19 +0100)
This reverts commit 31970ee7409ff2ed303b728ea4fd6f8d10302649.

lib/private/files.php

index 496ba1baff066f4a8061f81ee5b1b3a8dd877909..d42ab3d1852f585d7f1efb8b96f68dfd5c4d567c 100644 (file)
@@ -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,7 @@ class OC_Files {
                }
 
                if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
+                       $filename = \OC\Files\Filesystem::getLocalFile($filename);
                        header("X-Accel-Redirect: " . $filename);
                }
        }