Merge pull request #291 from koajs/vary

remove response.append(), use vary module
This commit is contained in:
TJ Holowaychuk 2014-06-06 23:00:39 -07:00
commit 63a4297084
4 changed files with 4 additions and 29 deletions

View file

@ -243,12 +243,6 @@ this.response.lastModified = new Date();
this.response.etag = crypto.createHash('md5').update(this.body).digest('hex'); this.response.etag = crypto.createHash('md5').update(this.body).digest('hex');
``` ```
### res.append(field, val)
Append `val` to header `field`.
### res.vary(field) ### res.vary(field)
Vary on `field`. Vary on `field`.

View file

@ -12,6 +12,7 @@ var status = require('statuses');
var destroy = require('dethroy'); var destroy = require('dethroy');
var http = require('http'); var http = require('http');
var path = require('path'); var path = require('path');
var vary = require('vary');
var basename = path.basename; var basename = path.basename;
var extname = path.extname; var extname = path.extname;
@ -201,7 +202,7 @@ module.exports = {
*/ */
vary: function(field){ vary: function(field){
this.append('Vary', field); vary(this.res, field);
}, },
/** /**
@ -393,28 +394,6 @@ module.exports = {
this.res.removeHeader(field); this.res.removeHeader(field);
}, },
/**
* Append `val` to header `field`.
*
* @param {String} field
* @param {String} val
* @api public
*/
append: function(field, val){
field = field.toLowerCase();
var header = this.header;
var list = header[field];
// not set
if (!list) return this.set(field, val);
// append
list = list.split(/ *, */);
if (!~list.indexOf(val)) list.push(val);
this.set(field, list.join(', '));
},
/** /**
* Checks if the request is writable. * Checks if the request is writable.
* Tests for the existence of the socket * Tests for the existence of the socket

View file

@ -36,6 +36,7 @@
"delegates": "0.0.3", "delegates": "0.0.3",
"dethroy": "~1.0.0", "dethroy": "~1.0.0",
"error-inject": "~1.0.0", "error-inject": "~1.0.0",
"vary": "~0.1.0",
"only": "0.0.2" "only": "0.0.2"
}, },
"devDependencies": { "devDependencies": {

View file

@ -8,6 +8,7 @@ var koa = require('..');
exports = module.exports = function(req, res){ exports = module.exports = function(req, res){
req = req || { headers: {}, socket: new ReadableStream() }; req = req || { headers: {}, socket: new ReadableStream() };
res = res || { _headers: {} }; res = res || { _headers: {} };
res.getHeader = function(k){ return res._headers[k.toLowerCase()] };
res.setHeader = function(k, v){ res._headers[k.toLowerCase()] = v }; res.setHeader = function(k, v){ res._headers[k.toLowerCase()] = v };
res.removeHeader = function(k, v){ delete res._headers[k.toLowerCase()] }; res.removeHeader = function(k, v){ delete res._headers[k.toLowerCase()] };
return koa().createContext(req, res); return koa().createContext(req, res);