| @@ -40,46 +40,30 @@ | ||
| 40 | 40 | //Get data |
| 41 | 41 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | -// first check if we have to send 304 | |
| 45 | -// inspired by http://www.jonasjohn.de/snippets/php/caching.htm | |
| 44 | +if ($encoding != 'none') | |
| 45 | +{ | |
| 46 | + // Send compressed contents | |
| 47 | + header('Content-Encoding: '.$encoding); | |
| 48 | +} | |
| 49 | +header('Vary: Accept-Encoding'); | |
| 50 | +header('Content-Length: '.strlen($contents)); | |
| 46 | 51 | |
| 47 | -$eTag=md5($contents); | |
| 48 | -$modTime=filemtime(__FILE__.'.none'); | |
| 52 | +header('Content-type: %%CONTENT%%; charset=utf-8'); | |
| 53 | +header('Cache-Control: max-age=315360000, public, must-revalidate'); | |
| 54 | +header('Expires: '.gmdate('D, d M Y H:i:s', time() + 315360000).' GMT'); //10 years | |
| 49 | 55 | |
| 50 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); | |
| 51 | -$modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); | |
| 56 | +echo $contents; | |
| 52 | 57 | |
| 53 | -if (($modTimeMatch)||($eTagMatch)) { | |
| 54 | - header('HTTP/1.1 304 Not Modified'); | |
| 55 | - header('Connection: close'); | |
| 56 | -} else { | |
| 57 | - // send all sorts of headers | |
| 58 | - $expireTime=60*60*24*355; // 1y max according to RFC | |
| 59 | - if ($encoding != 'none') { | |
| 60 | - header('Content-Encoding: '.$encoding); | |
| 61 | - } | |
| 62 | - header('Vary: Accept-Encoding'); | |
| 63 | - header('Content-Length: '.strlen($contents)); | |
| 64 | - header('Content-type: %%CONTENT%%; charset=utf-8'); | |
| 65 | - header('Cache-Control: max-age='.$expireTime.', public, immutable'); | |
| 66 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); | |
| 67 | - header('ETag: ' . $eTag); | |
| 68 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); | |
| 69 | - | |
| 70 | - // send output | |
| 71 | - echo $contents; | |
| 72 | - | |
| 73 | - //And write to filesystem cache if not done yet | |
| 74 | - if($encoding != 'none' && $iscompressed == false) | |
| 75 | - { | |
| 76 | - //Write the content we sent | |
| 77 | - file_put_contents(__FILE__.'.'.$encoding,$contents); | |
| 78 | - | |
| 79 | - //And write the new content | |
| 80 | - $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); | |
| 81 | - $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); | |
| 82 | - $contents = gzencode($code,9,$flag); | |
| 83 | - file_put_contents(__FILE__.'.'.$ext,$contents); | |
| 84 | - } | |
| 58 | +//Write it here | |
| 59 | +if($encoding != 'none' && $iscompressed == false) | |
| 60 | +{ | |
| 61 | + //Write the content we sent | |
| 62 | + file_put_contents(__FILE__.'.'.$encoding,$contents); | |
| 63 | + | |
| 64 | + //And write the new content | |
| 65 | + $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); | |
| 66 | + $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); | |
| 67 | + $contents = gzencode($code,9,$flag); | |
| 68 | + file_put_contents(__FILE__.'.'.$ext,$contents); | |
| 85 | 69 | } |
