Send URI instead of filepath to NGINX for X-Accel
This commit is contained in:
parent
bf7624fb25
commit
9b4643f386
|
@ -152,7 +152,7 @@ class OC_Files {
|
||||||
/** @var $storage \OC\Files\Storage\Storage */
|
/** @var $storage \OC\Files\Storage\Storage */
|
||||||
list($storage) = $view->resolvePath($filename);
|
list($storage) = $view->resolvePath($filename);
|
||||||
if ($storage->isLocal()) {
|
if ($storage->isLocal()) {
|
||||||
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
|
self::addSendfileHeader($filename);
|
||||||
} else {
|
} else {
|
||||||
\OC\Files\Filesystem::readfile($filename);
|
\OC\Files\Filesystem::readfile($filename);
|
||||||
}
|
}
|
||||||
|
@ -167,9 +167,11 @@ class OC_Files {
|
||||||
*/
|
*/
|
||||||
private static function addSendfileHeader($filename) {
|
private static function addSendfileHeader($filename) {
|
||||||
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
|
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
|
||||||
|
$filename = \OC\Files\Filesystem::getLocalFile($filename);
|
||||||
header("X-Sendfile: " . $filename);
|
header("X-Sendfile: " . $filename);
|
||||||
}
|
}
|
||||||
if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
|
if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
|
||||||
|
$filename = \OC\Files\Filesystem::getLocalFile($filename);
|
||||||
if (isset($_SERVER['HTTP_RANGE']) &&
|
if (isset($_SERVER['HTTP_RANGE']) &&
|
||||||
preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
|
preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
|
||||||
$filelength = filesize($filename);
|
$filelength = filesize($filename);
|
||||||
|
@ -185,6 +187,7 @@ class OC_Files {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
|
if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
|
||||||
|
$filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename;
|
||||||
header("X-Accel-Redirect: " . $filename);
|
header("X-Accel-Redirect: " . $filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue