| @@ -32,34 +32,17 @@ | ||
| 32 | 32 | |
| 33 | 33 | //Get data |
| 34 | 34 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 35 | 35 | |
| 36 | -// first check if we have to send 304 | |
| 37 | -$eTag=md5($contents); | |
| 38 | -$modTime=filemtime(__FILE__.'.none'); | |
| 36 | +if(isset($encoding) && $encoding != 'none') | |
| 37 | +{ | |
| 38 | + // Send compressed contents | |
| 39 | + header('Content-Encoding: '.$encoding); | |
| 40 | +} | |
| 41 | +header('Vary: Accept-Encoding'); | |
| 42 | +header('Content-Length: '.strlen($contents)); | |
| 39 | 43 | |
| 40 | -date_default_timezone_set("UTC"); | |
| 41 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); | |
| 42 | -$modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); | |
| 44 | +header('Content-type: %%CONTENT%%; charset=utf-8'); | |
| 45 | +header('Cache-Control: max-age=315360000, public, must-revalidate'); | |
| 46 | +header('Expires: '.gmdate('D, d M Y H:i:s', time() + 315360000).' GMT'); //10 years | |
| 43 | 47 | |
| 44 | -if (($modTimeMatch)||($eTagMatch)) { | |
| 45 | - header('HTTP/1.1 304 Not Modified'); | |
| 46 | - header('Connection: close'); | |
| 47 | -} else { | |
| 48 | - // send all sorts of headers | |
| 49 | - $expireTime=60*60*24*356; // 1y max according to RFC | |
| 50 | - | |
| 51 | - if(isset($encoding) && $encoding != 'none') | |
| 52 | - { | |
| 53 | - header('Content-Encoding: '.$encoding); | |
| 54 | - } | |
| 55 | - header('Vary: Accept-Encoding'); | |
| 56 | - header('Content-Length: '.strlen($contents)); | |
| 57 | - header('Content-type: %%CONTENT%%; charset=utf-8'); | |
| 58 | - header('Cache-Control: max-age='.$expireTime.', public, immutable'); | |
| 59 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years | |
| 60 | - header('ETag: ' . $eTag); | |
| 61 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); | |
| 62 | - | |
| 63 | - // send output | |
| 64 | - echo $contents; | |
| 65 | -} | |
| 48 | +echo $contents; | |