L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm23_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2013-07-10 12:05:16 +10:00
parent 17e37c57e4 0ba744205e
commit 8d296ea5e4
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+1 -9
View File
@@ -1956,11 +1956,7 @@ function readfile_accel($file, $mimetype, $accelerate) {
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
if (is_object($file)) {
if (empty($_SERVER['HTTP_RANGE'])) {
// Use Etag only when not byteserving,
// is it tag of this range or whole file?
header('Etag: ' . $file->get_contenthash());
}
header('Etag: "' . $file->get_contenthash() . '"');
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) and $_SERVER['HTTP_IF_NONE_MATCH'] === $file->get_contenthash()) {
header('HTTP/1.1 304 Not Modified');
return;
@@ -2610,10 +2606,6 @@ function byteserving_send_file($handle, $mimetype, $ranges, $filesize) {
// better turn off any kind of compression and buffering
@ini_set('zlib.output_compression', 'Off');
// Remove Etag because is is not strictly defined for byteserving,
// is it tag of this range or whole file?
header_remove('Etag');
$chunksize = 1*(1024*1024); // 1MB chunks - must be less than 2MB!
if ($handle === false) {
die;
lib/xsendfilelib.php
-6
View File
@@ -68,12 +68,6 @@ function xsendfile($filepath) {
}
}
// Remove Etag because is is not strictly defined for byteserving,
// is it tag of this range or whole file?
if (!empty($_SERVER['HTTP_RANGE'])) {
header_remove('Etag');
}
if ($CFG->xsendfile === 'X-LIGHTTPD-send-file') {
// http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file says 1.4 it does not support byteserving
header('Accept-Ranges: none');