Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-28708: Send 304 Not Modified response when browser If-Modified-Si…

…nce header is after file mtime
  • Loading branch information...
commit 68d9daa1876680e03571554423f61ff721aa69e9 1 parent 24654d9
@tlevi tlevi authored skodak committed
Showing with 30 additions and 0 deletions.
  1. +30 −0 lib/filelib.php
View
30 lib/filelib.php
@@ -1728,6 +1728,21 @@ function send_file($path, $filename, $lifetime = 'default' , $filter=0, $pathiss
//try to disable automatic sid rewrite in cookieless mode
@ini_set("session.use_trans_sid", "false");
+ if ($lifetime > 0 && !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+ // get unixtime of request header; clip extra junk off first
+ $since = strtotime(preg_replace('/;.*$/','',$_SERVER["HTTP_IF_MODIFIED_SINCE"]));
+ if ($since && $since >= $lastmodified) {
+ 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);
+ if ($dontdie) {
+ return;
+ }
+ die;
+ }
+ }
+
//do not put '@' before the next header to detect incorrect moodle configurations,
//error should be better than "weird" empty lines for admins/users
header('Last-Modified: '. gmdate('D, d M Y H:i:s', $lastmodified) .' GMT');
@@ -1943,6 +1958,21 @@ function send_stored_file($stored_file, $lifetime=86400 , $filter=0, $forcedownl
//try to disable automatic sid rewrite in cookieless mode
@ini_set("session.use_trans_sid", "false");
+ if ($lifetime > 0 && !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+ // get unixtime of request header; clip extra junk off first
+ $since = strtotime(preg_replace('/;.*$/','',$_SERVER["HTTP_IF_MODIFIED_SINCE"]));
+ if ($since && $since >= $lastmodified) {
+ 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);
+ if ($dontdie) {
+ return;
+ }
+ die;
+ }
+ }
+
//do not put '@' before the next header to detect incorrect moodle configurations,
//error should be better than "weird" empty lines for admins/users
//TODO: should we remove all those @ before the header()? Are all of the values supported on all servers?
Please sign in to comment.
Something went wrong with that request. Please try again.