Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'm25_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of http…

…s://github.com/scara/moodle into MOODLE_25_STABLE
  • Loading branch information...
commit 534f1476f409a07ce2c4ccebeadd5d29393156e7 2 parents b625e48 + 52286ac
@danpoltawski danpoltawski authored
Showing with 1 addition and 15 deletions.
  1. +1 −9 lib/filelib.php
  2. +0 −6 lib/xsendfilelib.php
View
10 lib/filelib.php
@@ -2021,11 +2021,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;
@@ -2675,10 +2671,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;
View
6 lib/xsendfilelib.php
@@ -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');
Please sign in to comment.
Something went wrong with that request. Please try again.