Ignore Pragma when Cache-Control is present but blank

robhanlon22 · robhanlon22 · commit 747c6777ceea · 2019-02-09T11:23:08.000-08:00
diff --git a/index.js b/index.js
@@ -85,7 +85,7 @@ module.exports = class CachePolicy {
 
         // When the Cache-Control header field is not present in a request, caches MUST consider the no-cache request pragma-directive
         // as having the same effect as if "Cache-Control: no-cache" were present (see Section 5.2.1).
-        if (!res.headers['cache-control'] && /no-cache/.test(res.headers.pragma)) {
+        if (res.headers['cache-control'] == null && /no-cache/.test(res.headers.pragma)) {
             this._rescc['no-cache'] = true;
         }
     }
diff --git a/test/responsetest.js b/test/responsetest.js
@@ -223,6 +223,15 @@ describe('Response headers', function() {
         assert(cache.stale());
     });
 
+    it('blank cache-control and pragma: no-cache', function() {
+        const cache = new CachePolicy(req, {headers:{
+            'cache-control': '',
+            'pragma': 'no-cache',
+            'last-modified': new Date().toGMTString(),
+        }});
+        assert(!cache.stale());
+    });
+
     it('no-store', function() {
         const cache = new CachePolicy(req, {headers:{
             'cache-control': 'no-store, public, max-age=1',

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ module.exports = class CachePolicy {`
`85`	`85`
`86`	`86`	`// When the Cache-Control header field is not present in a request, caches MUST consider the no-cache request pragma-directive`
`87`	`87`	`// as having the same effect as if "Cache-Control: no-cache" were present (see Section 5.2.1).`
`88`		`- if (!res.headers['cache-control'] && /no-cache/.test(res.headers.pragma)) {`
	`88`	`+ if (res.headers['cache-control'] == null && /no-cache/.test(res.headers.pragma)) {`
`89`	`89`	`this._rescc['no-cache'] = true;`
`90`	`90`	`}`
`91`	`91`	`}`