Handling cache-control header rewrite better

avoidwork · Feb 6, 2017 · 9794b25 · 9794b25
1 parent 0e660d1
commit 9794b25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/tenso.js b/lib/tenso.js
@@ -123,11 +123,12 @@ class Tenso {
 
 			if (!regex.get_rewrite.test(req.method)) {
 				if (!ref[0]["cache-control"] && this.server.config.headers["cache-control"]) {
-					ref[0]["cache-control"] = utility.clone(this.server.config.headers["cache-control"]) || "no-cache";
+					ref[0]["cache-control"] = utility.clone(this.server.config.headers["cache-control"]) || "public";
 				}
 
 				if (req.protect && !regex.private.test(ref[0]["cache-control"])) {
-					ref[0]["cache-control"] = "private, " + ref[0]["cache-control"].replace(/(private|public),\s/g, "");
+					ref[0]["cache-control"].replace(/(private|public)(,\s)?/g, "");
+					ref[0]["cache-control"] = "private" + (ref[0]["cache-control"].length > 0 ? ", " : "") + (ref[0]["cache-control"] || "");
 				}
 
 				if (!regex.modify.test(req.method) && regex.modify.test(req.allow) && this.server.config.security.csrf && res.locals[this.server.config.security.key]) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is an elastic REST API gateway for node.js",
-  "version": "4.3.19",
+  "version": "4.3.20",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {