$ext = 'ico';
}
if ($cacheimage) {
- if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+ if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
// 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('HTTP/1.1 304 Not Modified');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: max-age='.$lifetime);
header('Content-Type: '.$mimetype);
$candidate = "$CFG->dataroot/cache/theme/$themename/javascript_$type.js";
if ($rev > -1 and file_exists($candidate)) {
- if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+ if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
// 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
+ header('HTTP/1.1 304 Not Modified');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: max-age='.$lifetime);
header('Content-Type: application/javascript; charset=utf-8');
$candidatesheet = "$CFG->dataroot/cache/theme/$themename/css/$type.css";
if (file_exists($candidatesheet)) {
- if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+ if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
// 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
+ header('HTTP/1.1 304 Not Modified');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: max-age='.$lifetime);
header('Content-Type: text/css; charset=utf-8');
// If-Modified-Since header, we can send back a 304 Not Modified since the
// content never changes (the rev number is increased any time the content changes)
if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
- header('HTTP/1.1 304 Not Modified');
$lifetime = 60*60*24*30; // 30 days
+ header('HTTP/1.1 304 Not Modified');
header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
header('Cache-Control: max-age='.$lifetime);
header('Content-Type: '.$mimetype);