Skip to content

Commit eab6b11

Browse files
committed
use vary module
closes #10
1 parent d495782 commit eab6b11

File tree

3 files changed

+3
-69
lines changed

3 files changed

+3
-69
lines changed

index.js

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var accepts = require('accepts');
1414
var bytes = require('bytes');
1515
var onHeaders = require('on-headers');
1616
var compressible = require('compressible');
17+
var vary = require('vary');
1718

1819
/**
1920
* Supported content-encoding methods.
@@ -196,29 +197,3 @@ function addListeners(stream, on, listeners) {
196197
}
197198

198199
function noop(){}
199-
200-
/**
201-
* Add val to Vary header
202-
*/
203-
204-
function vary(res, val) {
205-
var header = res.getHeader('Vary') || ''
206-
var headers = Array.isArray(header)
207-
? header.join(', ')
208-
: header
209-
210-
// enumerate current values
211-
var vals = headers.toLowerCase().split(/ *, */)
212-
213-
if (vals.indexOf(val.toLowerCase()) !== -1) {
214-
// already set
215-
return
216-
}
217-
218-
// append value (in existing format)
219-
header = headers
220-
? headers + ', ' + val
221-
: val
222-
223-
res.setHeader('Vary', header)
224-
}

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"accepts": "1.0.2",
2121
"bytes": "1.0.0",
2222
"compressible": "1.1.0",
23-
"on-headers": "0.0.0"
23+
"on-headers": "0.0.0",
24+
"vary": "0.0.0"
2425
},
2526
"devDependencies": {
2627
"istanbul": "0.2.10",

test/test.js

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -77,48 +77,6 @@ describe('compress()', function(){
7777
.expect('Vary', 'Accept-Encoding', done)
7878
})
7979

80-
it('should append to Vary', function(done){
81-
var server = createServer({ threshold: 0 }, function (req, res) {
82-
res.setHeader('Content-Type', 'text/plain')
83-
res.setHeader('Vary', 'User-Agent')
84-
res.end('hello, world')
85-
})
86-
87-
request(server)
88-
.get('/')
89-
.set('Accept-Encoding', 'gzip')
90-
.expect('Content-Encoding', 'gzip')
91-
.expect('Vary', 'User-Agent, Accept-Encoding', done)
92-
})
93-
94-
it('should append to Vary when array', function(done){
95-
var server = createServer({ threshold: 0 }, function (req, res) {
96-
res.setHeader('Content-Type', 'text/plain')
97-
res.setHeader('Vary', ['User-Agent', 'Origin'])
98-
res.end('hello, world')
99-
})
100-
101-
request(server)
102-
.get('/')
103-
.set('Accept-Encoding', 'gzip')
104-
.expect('Content-Encoding', 'gzip')
105-
.expect('Vary', 'User-Agent, Origin, Accept-Encoding', done)
106-
})
107-
108-
it('should not double-append to Vary', function(done){
109-
var server = createServer({ threshold: 0 }, function (req, res) {
110-
res.setHeader('Content-Type', 'text/plain')
111-
res.setHeader('Vary', 'Accept-Encoding, User-Agent')
112-
res.end('hello, world')
113-
})
114-
115-
request(server)
116-
.get('/')
117-
.set('Accept-Encoding', 'gzip')
118-
.expect('Content-Encoding', 'gzip')
119-
.expect('Vary', 'Accept-Encoding, User-Agent', done)
120-
})
121-
12280
it('should set Vary even if Accept-Encoding is not set', function(done){
12381
var server = createServer({ threshold: 1000 }, function (req, res) {
12482
res.setHeader('Content-Type', 'text/plain')

0 commit comments

Comments
 (0)