From 3f20a080fedd47e2614c44ebe1824f2ee46bb767 Mon Sep 17 00:00:00 2001 From: mvn23 Date: Thu, 20 Jun 2013 12:23:25 +0300 Subject: [PATCH] Revert most changes for testing --- lib/files.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/files.php b/lib/files.php index 123c87eb5f..20ad2405fc 100644 --- a/lib/files.php +++ b/lib/files.php @@ -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[0-9]+)-(?P[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[0-9]+)-(?P[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); }