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

Reviewed code for X-Sendfile2 

Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
This commit is contained in:
mvn23 2013-06-20 17:46:36 +03:00
parent 3f20a080fe
commit 59fa3055e1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/files.php
View File

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