mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove XSendFile support 

Required to ensure proper locking
This commit is contained in:
Lukas Reschke 2015-09-07 16:52:50 +02:00
parent f3e6e0121d
commit 84797023ed
1 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/private/files.php
View File

@ -86,15 +86,6 @@ class OC_Files {
*/ */
public static function get($dir, $files, $only_header = false) { public static function get($dir, $files, $only_header = false) {
$view = \OC\Files\Filesystem::getView(); $view = \OC\Files\Filesystem::getView();
$xsendfile = false;
if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
isset($_SERVER['MOD_X_SENDFILE2_ENABLED']) ||
isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])
) {
$xsendfile = true;
}
}
if (is_array($files) && count($files) === 1) { if (is_array($files) && count($files) === 1) {
$files = $files[0]; $files = $files[0];
@ -129,9 +120,6 @@ class OC_Files {
if ($get_type === self::FILE) { if ($get_type === self::FILE) {
$zip = false; $zip = false;
if ($xsendfile && \OC::$server->getEncryptionManager()->isEnabled()) {
$xsendfile = false;
}
} else { } else {
$zip = new ZipStreamer(false); $zip = new ZipStreamer(false);
} }
@ -176,17 +164,7 @@ class OC_Files {
$zip->finalize(); $zip->finalize();
set_time_limit($executionTime); set_time_limit($executionTime);
} else { } else {
if ($xsendfile) { \OC\Files\Filesystem::readfile($filename);
/** @var $storage \OC\Files\Storage\Storage */
list($storage) = $view->resolvePath($filename);
if ($storage->isLocal()) {
self::addSendfileHeader($filename);
} else {
\OC\Files\Filesystem::readfile($filename);
}
} else {
\OC\Files\Filesystem::readfile($filename);
}
} }
if ($get_type === self::FILE) { if ($get_type === self::FILE) {
$view->unlockFile($filename, ILockingProvider::LOCK_SHARED); $view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
@ -202,40 +180,6 @@ class OC_Files {
} }
} }
/**
* @param false|string $filename
*/
private static function addSendfileHeader($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);
if ($range[2] === "") {
$range[2] = $filelength - 1;
}
header("Content-Range: bytes $range[1]-$range[2]/" . $filelength);
header("HTTP/1.1 206 Partial content");
header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " $range[1]-$range[2]");
} else {
header("X-Sendfile: " . $filename);
}
}
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);
}
}
/** /**
* @param string $dir * @param string $dir
* @param ZipStreamer $zip * @param ZipStreamer $zip