Permalink
Browse files

MDL-28709 adding HTTP_IF_MODIFIED_SINCE and minor style tweaks

  • Loading branch information...
1 parent 716f93e commit 4bdcd23e19cbbaf459ba565c2213a0046396ae26 @skodak skodak committed Aug 19, 2011
Showing with 7 additions and 8 deletions.
  1. +2 −3 theme/image.php
  2. +2 −2 theme/javascript.php
  3. +2 −2 theme/styles.php
  4. +1 −1 theme/yui_combo.php
View
@@ -71,13 +71,12 @@
$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);
View
@@ -49,11 +49,11 @@
$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');
View
@@ -53,11 +53,11 @@
$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');
View
@@ -49,8 +49,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);

0 comments on commit 4bdcd23

Please sign in to comment.