diff CacheTimeCheck.inc @ 116:374e3eff07fd

Branch merge
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Thu, 17 Mar 2016 22:34:49 +0100
parents adf7b11921f4
children df158368051e
line wrap: on
line diff
--- a/CacheTimeCheck.inc	Thu Mar 17 22:32:33 2016 +0100
+++ b/CacheTimeCheck.inc	Thu Mar 17 22:34:49 2016 +0100
@@ -26,15 +26,15 @@
     //print_r($gmdate_mod);
   }
 
+  foreach($cache->cacheControl() as $header => $value) {
+    header ("${header}: ${value}");
+  }
   if(array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
     $HTTP_IF_MODIFIED_SINCE = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
     $if_modified_since = preg_replace('/;.*$/', '', $HTTP_IF_MODIFIED_SINCE);
 
     if (strtotime($if_modified_since) >= $cache->getNewest()) {
       header("HTTP/1.0 304 Not Modified");
-      foreach($cache->cacheControl() as $header => $value) {
-	header ("${header}: ${value}");
-      }
       return false;
     }
   }