Merge branch 'remove-header-fields'

lib/response.js

@@ -22,31 +22,23 @@ var fs = require('fs')
   , join = path.join;
 
 /**
- * Send a response with the given `body` and optional `headers` and `status` code.
+ * Send a response with the given `body` and optional `status` code.
  *
  * Examples:
  *
  *     res.send(new Buffer('wahoo'));
  *     res.send({ some: 'json' });
  *     res.send('<p>some html</p>');
  *     res.send('Sorry, cant find that', 404);
- *     res.send('text', { 'Content-Type': 'text/plain' }, 201);
  *     res.send(404);
  *
  * @param {String|Object|Number|Buffer} body or status
- * @param {Object|Number} headers or status
  * @param {Number} status
  * @return {ServerResponse}
  * @api public
  */
 
-res.send = function(body, headers, status){
-  // allow status as second arg
-  if ('number' == typeof headers) {
-    status = headers,
-    headers = null;
-  }
-
+res.send = function(body, status){
   // default status
   status = status || this.statusCode;
 
@@ -71,7 +63,7 @@ res.send = function(body, headers, status){
           this.contentType('.bin');
         }
       } else {
-        return this.json(body, headers, status);
+        return this.json(body, status);
       }
       break;
   }
@@ -83,15 +75,6 @@ res.send = function(body, headers, status){
       : Buffer.byteLength(body));
   }
 
-  // merge headers passed
-  if (headers) {
-    var fields = Object.keys(headers);
-    for (var i = 0, len = fields.length; i < len; ++i) {
-      var field = fields[i];
-      this.header(field, headers[field]);
-    }
-  }
-
   // strip irrelevant headers
   if (204 == status || 304 == status) {
     this.removeHeader('Content-Type');
@@ -105,7 +88,7 @@ res.send = function(body, headers, status){
 };
 
 /**
- * Send JSON response with `obj`, optional `headers`, and optional `status`.
+ * Send JSON response with `obj` and optional `status`.
  *
  * Examples:
  *
@@ -115,13 +98,13 @@ res.send = function(body, headers, status){
  *     res.json('I dont have that', 404);
  *
  * @param {Mixed} obj
- * @param {Object|Number} headers or status
+ * @param {Number} status
  * @param {Number} status
  * @return {ServerResponse}
  * @api public
  */
 
-res.json = function(obj, headers, status){
+res.json = function(obj, status){
   var body = JSON.stringify(obj)
     , callback = this.req.query.callback
     , jsonp = this.app.enabled('jsonp callback');
@@ -134,7 +117,7 @@ res.json = function(obj, headers, status){
     body = callback.replace(/[^\w$.]/g, '') + '(' + body + ');';
   }
 
-  return this.send(body, headers, status);
+  return this.send(body, status);
 };
 
 /**
@@ -266,16 +249,16 @@ res.download = function(path, filename, fn, fn2){
  *
  * @param {String} name
  * @param {String} val
- * @return {String}
+ * @return {ServerResponse} for chaining
  * @api public
  */
 
 res.header = function(name, val){
-  if (val === undefined) {
+  if (1 == arguments.length) {
     return this.getHeader(name);
   } else {
     this.setHeader(name, val);
-    return val;
+    return this;
   }
 };
 

lib/router/index.js

@@ -266,7 +266,7 @@ Router.prototype._dispatch = function(req, res, next){
 Router.prototype._options = function(req, res){
   var path = parse(req.url).pathname
     , body = this._optionsFor(path).join(',');
-  res.send(body, { Allow: body });
+  res.header('Allow', body).send(body);
 };
 
 /**