Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MDL-40002 Files: ETag value must be a quoted-string.
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11.
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
  • Loading branch information
scara committed Jun 9, 2013
1 parent 6c41397 commit 8348ec0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions lib/csslib.php
Expand Up @@ -228,7 +228,7 @@ function css_send_ie_css($themename, $rev, $etag, $slasharguments) {
$css .= "\n@import url($relroot/styles.php?theme=$themename&rev=$rev&type=theme);";
}

header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
header('Content-Disposition: inline; filename="styles.php"');
header('Last-Modified: '. gmdate('D, d M Y H:i:s', time()) .' GMT');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
Expand All @@ -254,7 +254,7 @@ function css_send_ie_css($themename, $rev, $etag, $slasharguments) {
function css_send_cached_css($csspath, $etag) {
$lifetime = 60*60*24*60; // 60 days only - the revision may get incremented quite often

header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
header('Content-Disposition: inline; filename="styles.php"');
header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($csspath)) .' GMT');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
Expand Down Expand Up @@ -312,7 +312,7 @@ function css_send_unmodified($lastmodified, $etag) {
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: public, max-age='.$lifetime);
header('Content-Type: text/css; charset=utf-8');
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
if ($lastmodified) {
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
}
Expand Down
4 changes: 2 additions & 2 deletions lib/jslib.php
Expand Up @@ -36,7 +36,7 @@ function js_send_cached($jspath, $etag, $filename = 'javascript.php') {

$lifetime = 60*60*24*60; // 60 days only - the revision may get incremented quite often

header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
header('Content-Disposition: inline; filename="'.$filename.'"');
header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($jspath)) .' GMT');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
Expand Down Expand Up @@ -86,7 +86,7 @@ function js_send_unmodified($lastmodified, $etag) {
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: public, max-age='.$lifetime);
header('Content-Type: application/javascript; charset=utf-8');
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
if ($lastmodified) {
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
}
Expand Down
6 changes: 3 additions & 3 deletions theme/image.php
Expand Up @@ -114,7 +114,7 @@
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: public, max-age='.$lifetime);
header('Content-Type: '.$mimetype);
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
die;
}
send_cached_image($cacheimage, $etag);
Expand Down Expand Up @@ -206,7 +206,7 @@ function send_cached_image($imagepath, $etag) {

$mimetype = get_contenttype_from_ext($pathinfo['extension']);

header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
header('Content-Disposition: inline; filename="'.$imagename.'"');
header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($imagepath)) .' GMT');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
Expand Down Expand Up @@ -293,4 +293,4 @@ function cache_image($image, $imagefile, $candidatelocation) {
@unlink($cacheimage.'.tmp'); // just in case anything fails
}
return $cacheimage;
}
}
4 changes: 2 additions & 2 deletions theme/yui_combo.php
Expand Up @@ -61,7 +61,7 @@
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: public, max-age='.$lifetime);
header('Content-Type: '.$mimetype);
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
die;
}

Expand Down Expand Up @@ -187,7 +187,7 @@ function combo_send_cached($content, $mimetype, $etag, $lastmodified) {
header('Cache-Control: public, max-age='.$lifetime);
header('Accept-Ranges: none');
header('Content-Type: '.$mimetype);
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
if (!min_enable_zlib_compression()) {
header('Content-Length: '.strlen($content));
}
Expand Down
4 changes: 2 additions & 2 deletions theme/yui_image.php
Expand Up @@ -92,7 +92,7 @@
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: public, max-age='.$lifetime);
header('Content-Type: '.$mimetype);
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');
die;
}

Expand All @@ -113,7 +113,7 @@ function yui_image_cached($imagepath, $imagename, $mimetype, $etag) {
header('Accept-Ranges: none');
header('Content-Type: '.$mimetype);
header('Content-Length: '.filesize($imagepath));
header('Etag: '.$etag);
header('Etag: "'.$etag.'"');

if (xsendfile($imagepath)) {
die;
Expand Down

0 comments on commit 8348ec0

Please sign in to comment.