Revert most changes for testing

This commit is contained in:
mvn23 2013-06-20 12:23:25 +03:00
parent a25bfa9291
commit 3f20a080fe
1 changed files with 13 additions and 11 deletions

View File

@ -173,18 +173,20 @@ class OC_Files {
header("X-Sendfile: " . $filename);
}
if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
if (isset($_SERVER['HTTP_RANGE']) &&
preg_match("/\Abytes=(?P<start>[0-9]+)-(?P<end>[0-9]*)\z/", $_SERVER['HTTP_RANGE'], $range)) {
if ($range['end'] == "") {
$range['end'] = filesize($filename) - 1;
}
header("Content-Range: bytes " . $range['start'] . "-" . $range['end'] . "/" . filesize($filename));
header("HTTP/1.1 206 Partial content");
header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " " . $range['start'] . "-" . $range['end']);
} else {
header("X-Sendfile: " . $filename);
}
/* if (isset($_SERVER['HTTP_RANGE']) &&
* preg_match("/\Abytes=(?P<start>[0-9]+)-(?P<end>[0-9]*)\z/", $_SERVER['HTTP_RANGE'], $range)) {
* if ($range['end'] == "") {
* $range['end'] = filesize($filename) - 1;
* }
* header("Content-Range: bytes " . $range['start'] . "-" . $range['end'] . "/" . filesize($filename));
* header("HTTP/1.1 206 Partial content");
* header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " " . $range['start'] . "-" . $range['end']);
* } else {
*/
header("X-Sendfile: " . $filename);
// }
}
if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
header("X-Accel-Redirect: " . $filename);
}