remove maxAge: undefined header, send maxAge even if set to 0

3 files changed, 7 insertions, 11 deletions

diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
index 585a7eab..474f475e 100644
--- a/src/node/hooks/express/specialpages.js
+++ b/src/node/hooks/express/specialpages.js
@@ -6,27 +6,27 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   //serve index.html under /
   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
   args.app.get('/robots.txt', function(req, res)
   {
     var filePath = path.normalize(__dirname + "/../../../static/robots.txt");
-    res.sendfile(filePath, { maxAge: exports.maxAge });
+    res.sendfile(filePath);
   });
 
   //serve favicon.ico
   args.app.get('/favicon.ico', function(req, res)
   {
     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
       if(err)
       {
 	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
   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
   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"));
   });
 
 }
\ No newline at end of file
diff --git a/src/node/server.js b/src/node/server.js
index 8e6d6fa0..bc4333cd 100644
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -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)";
 
-//cache 6 hours, by default
-var hour = 60*60;
-exports.maxAge = settings.maxAge || 6 * hour;
-
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);
 
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 1466ceaf..c5996565 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -108,7 +108,7 @@ exports.minify = function(req, res, next)
       date = new Date(date);
       res.setHeader('last-modified', 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);
         res.setHeader('expires', expiresDate.toUTCString());
         res.setHeader('cache-control', 'max-age=' + settings.maxAge);