fix adding Vary when value stored as array

expressjs · Jun 3, 2014 · 7c97aa7 · 7c97aa7
1 parent 38d0bda
commit 7c97aa7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+ * fix adding `Vary` when value stored as array
  * fix back-pressure behavior
  * fix length check for `res.end`
 

diff --git a/index.js b/index.js
@@ -115,12 +115,7 @@ module.exports = function compression(options) {
       if (!filter(req, res)) return;
 
       // vary
-      var vary = res.getHeader('Vary');
-      if (!vary) {
-        res.setHeader('Vary', 'Accept-Encoding');
-      } else if (!~vary.indexOf('Accept-Encoding')) {
-        res.setHeader('Vary', vary + ', Accept-Encoding');
-      }
+      vary(res, 'Accept-Encoding')
 
       if (!compress) return;
 
@@ -172,3 +167,29 @@ module.exports = function compression(options) {
 };
 
 function noop(){}
+
+/**
+ * Add val to Vary header
+ */
+
+function vary(res, val) {
+  var header = res.getHeader('Vary') || ''
+  var headers = Array.isArray(header)
+    ? header.join(', ')
+    : header
+
+  // enumerate current values
+  var vals = headers.toLowerCase().split(/ *, */)
+
+  if (vals.indexOf(val.toLowerCase()) !== -1) {
+    // already set
+    return
+  }
+
+  // append value (in existing format)
+  header = headers
+    ? headers + ', ' + val
+    : val
+
+  res.setHeader('Vary', header)
+}