From 42de49cfb16df32142f312f3396d0a8737431901 Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Thu, 25 Sep 2014 19:49:34 +0200
Subject: expire all scripts, short max-age for testing
---
itjs.class | 2 +-
itjs.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/itjs.class b/itjs.class
index fb3ac13..b25141e 100644
--- a/itjs.class
+++ b/itjs.class
@@ -191,7 +191,7 @@ static function checksum($fnlist)
$filenames = array_merge(is_array($fnlist) ? $fnlist : itjs::filenames($fnlist), array("/www/lib.search.ch/var/jquery-ui/dist/minified/jquery.ui.core.min.js", "/www/lib.search.ch/var/jquery/dist/jquery.min.js")); # jquery files included by lib/jquery.js
$key = "itjs_" . md5(join("", it::map('"$v" . @filemtime("$v")', $filenames)));
- return it_cache::get($key) ?: it_cache::put($key, substr(md5(self::filecontents($filenames, false)), 0, 8), array('ttl' => 60));
+ return it_cache::get($key) ?: it_cache::put($key, substr(md5(self::filecontents($filenames, false)), 0, 9), array('ttl' => 60));
}
function crcurl($url)
diff --git a/itjs.php b/itjs.php
index 32f3a16..3d7d368 100644
--- a/itjs.php
+++ b/itjs.php
@@ -71,7 +71,7 @@ else if (!it::match('\.html$', $file))
if (it::is_live() && !$_REQUEST['retry'])
{
- $keeptime = $_REQUEST['s'] || $_REQUEST['c'] ? 86400*30 : 900; # long expire if checksum present
+ $keeptime = 0 && $_REQUEST['s'] || $_REQUEST['c'] ? 86400*30 : 900; # long expire if checksum present DISABLED
header("Cache-Control: max-age=$keeptime, private"); # proxies should not cache since contents of same url can differ between browsers
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $keeptime). " GMT");
}
--
cgit v1.2.3