fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #597 from fourplusone/fix/max-age 

Fix max-age
This commit is contained in:
John McLear 2012-04-04 08:44:04 -07:00
parent d7e94aa80a 137e06d52b
commit be5aec7e20
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/node/hooks/express/specialpages.js
View File

@ -6,27 +6,27 @@ exports.expressCreateServer = function (hook_name, args, cb) {
//serve index.html under / //serve index.html under /
args.app.get('/', function(req, res) args.app.get('/', function(req, res)
{ {
res.send(eejs.require("ep_etherpad-lite/templates/index.html"), { maxAge: exports.maxAge }); res.send(eejs.require("ep_etherpad-lite/templates/index.html"));
}); });
//serve robots.txt //serve robots.txt
args.app.get('/robots.txt', function(req, res) args.app.get('/robots.txt', function(req, res)
{ {
var filePath = path.normalize(__dirname + "/../../../static/robots.txt"); var filePath = path.normalize(__dirname + "/../../../static/robots.txt");
res.sendfile(filePath, { maxAge: exports.maxAge }); res.sendfile(filePath);
}); });
//serve favicon.ico //serve favicon.ico
args.app.get('/favicon.ico', function(req, res) args.app.get('/favicon.ico', function(req, res)
{ {
var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico"); var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico");
res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) res.sendfile(filePath, function(err)
{ {
//there is no custom favicon, send the default favicon //there is no custom favicon, send the default favicon
if(err) if(err)
{ {
filePath = path.normalize(__dirname + "/../../../static/favicon.ico"); filePath = path.normalize(__dirname + "/../../../static/favicon.ico");
res.sendfile(filePath, { maxAge: exports.maxAge }); res.sendfile(filePath);
} }
}); });
}); });
@ -34,13 +34,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
//serve pad.html under /p //serve pad.html under /p
args.app.get('/p/:pad', function(req, res, next) args.app.get('/p/:pad', function(req, res, next)
{ {
res.send(eejs.require("ep_etherpad-lite/templates/pad.html"), { maxAge: exports.maxAge }); res.send(eejs.require("ep_etherpad-lite/templates/pad.html"));
}); });
//serve timeslider.html under /p/$padname/timeslider //serve timeslider.html under /p/$padname/timeslider
args.app.get('/p/:pad/timeslider', function(req, res, next) args.app.get('/p/:pad/timeslider', function(req, res, next)
{ {
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html"), { maxAge: exports.maxAge }); res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html"));
}); });
} }

4
src/node/server.js
View File

@ -51,10 +51,6 @@ console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)"; var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
//cache 6 hours, by default
var hour = 60*60;
exports.maxAge = settings.maxAge || 6 * hour;
//set loglevel //set loglevel
log4js.setGlobalLogLevel(settings.loglevel); log4js.setGlobalLogLevel(settings.loglevel);

2
src/node/utils/Minify.js
View File

@ -108,7 +108,7 @@ exports.minify = function(req, res, next)
date = new Date(date); date = new Date(date);
res.setHeader('last-modified', date.toUTCString()); res.setHeader('last-modified', date.toUTCString());
res.setHeader('date', (new Date()).toUTCString()); res.setHeader('date', (new Date()).toUTCString());
if (settings.maxAge) { if (settings.maxAge !== undefined) {
var expiresDate = new Date((new Date()).getTime()+settings.maxAge*1000); var expiresDate = new Date((new Date()).getTime()+settings.maxAge*1000);
res.setHeader('expires', expiresDate.toUTCString()); res.setHeader('expires', expiresDate.toUTCString());
res.setHeader('cache-control', 'max-age=' + settings.maxAge); res.setHeader('cache-control', 'max-age=' + settings.maxAge);