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

MDL-28709: Performance: Send cache/contenttype headers with 304 responses

Browse Source
This commit is contained in:
Tony Levi
2011-08-19 16:50:16 +02:00
committed by Petr Skoda
parent 24654d977b
commit 716f93efdb
4 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/image.php
+29 -17
View File
@@ -56,20 +56,31 @@ if ($rev > -1) {
$cacheimage = false;
if (file_exists("$candidatelocation/$image.gif")) {
$cacheimage = "$candidatelocation/$image.gif";
$ext = 'gif';
} else if (file_exists("$candidatelocation/$image.png")) {
$cacheimage = "$candidatelocation/$image.png";
$ext = 'png';
} else if (file_exists("$candidatelocation/$image.jpg")) {
$cacheimage = "$candidatelocation/$image.jpg";
$ext = 'jpg';
} else if (file_exists("$candidatelocation/$image.jpeg")) {
$cacheimage = "$candidatelocation/$image.jpeg";
$ext = 'jpeg';
} else if (file_exists("$candidatelocation/$image.ico")) {
$cacheimage = "$candidatelocation/$image.ico";
$ext = 'ico';
}
if ($cacheimage) {
if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
// we do not actually need to verify the etag value because our files
// never change in cache because we increment the rev parameter
header('HTTP/1.1 304 Not Modified');
$lifetime = 60*60*24*30; // 30 days
$mimetype = get_contenttype_from_ext($ext);
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: max-age='.$lifetime);
header('Content-Type: '.$mimetype);
die;
}
send_cached_image($cacheimage, $rev);
@@ -125,14 +136,7 @@ function send_cached_image($imagepath, $rev) {
$pathinfo = pathinfo($imagepath);
$imagename = $pathinfo['filename'].'.'.$pathinfo['extension'];
switch($pathinfo['extension']) {
case 'gif' : $mimetype = 'image/gif'; break;
case 'png' : $mimetype = 'image/png'; break;
case 'jpg' : $mimetype = 'image/jpeg'; break;
case 'jpeg' : $mimetype = 'image/jpeg'; break;
case 'ico' : $mimetype = 'image/vnd.microsoft.icon'; break;
default: $mimetype = 'document/unknown';
}
$mimetype = get_contenttype_from_ext($pathinfo['extension']);
header('Etag: '.md5("$rev/$imagepath"));
header('Content-Disposition: inline; filename="'.$imagename.'"');
@@ -154,14 +158,7 @@ function send_uncached_image($imagepath) {
$pathinfo = pathinfo($imagepath);
$imagename = $pathinfo['filename'].'.'.$pathinfo['extension'];
switch($pathinfo['extension']) {
case 'gif' : $mimetype = 'image/gif'; break;
case 'png' : $mimetype = 'image/png'; break;
case 'jpg' : $mimetype = 'image/jpeg'; break;
case 'jpeg' : $mimetype = 'image/jpeg'; break;
case 'ico' : $mimetype = 'image/vnd.microsoft.icon'; break;
default: $mimetype = 'document/unknown';
}
$mimetype = get_contenttype_from_ext($pathinfo['extension']);
header('Content-Disposition: inline; filename="'.$imagename.'"');
header('Last-Modified: '. gmdate('D, d M Y H:i:s', time()) .' GMT');
@@ -178,4 +175,19 @@ function send_uncached_image($imagepath) {
function image_not_found() {
header('HTTP/1.0 404 not found');
die('Image was not found, sorry.');
}
}
function get_contenttype_from_ext($ext) {
switch ($ext) {
case 'gif':
return 'image/gif';
case 'png':
return 'image/png';
case 'jpg':
case 'jpeg':
return 'image/jpeg';
case 'ico':
return 'image/vnd.microsoft.icon';
}
return 'document/unknown';
}