Fixed res.redirect() 406. Closes expressjs#1154

Author: tj

lib/response.js

@@ -346,7 +346,7 @@ res.type = function(type){
  * @api public
  */
 
-res.format = function(obj){
+res.format = function(obj, fn){
   var keys = Object.keys(obj)
     , req = this.req
     , next = req.next
@@ -357,6 +357,8 @@ res.format = function(obj){
   if (key) {
     this.set('Content-Type', normalizeType(key));
     obj[key](req, this, next);
+  } else if (fn) {
+    fn();
   } else {
     var err = new Error('Not Acceptable');
     err.status = 406;
@@ -555,11 +557,14 @@ res.redirect = function(url){
     html: function(){
       body = '<p>' + statusCodes[status] + '. Redirecting to <a href="' + url + '">' + url + '</a></p>';
     }
+  }, function(){
+    body = '';
   })
 
   // Respond
   this.statusCode = status;
   this.set('Location', url);
+  this.set('Content-Length', Buffer.byteLength(body));
   this.end(head ? null : body);
 };
 

test/res.redirect.js

@@ -248,9 +248,32 @@ describe('res', function(){
       .set('Accept', 'text/plain, */*')
       .end(function(res){
         res.headers.should.have.property('location', 'http://google.com');
+        res.headers.should.have.property('content-length', '51');
         res.body.should.equal('Moved Temporarily. Redirecting to http://google.com');
         done();
       })
     })
   })
+
+  describe('when accepting neither text or html', function(){
+    it('should respond with an empty body', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.redirect('http://google.com');
+      });
+
+      request(app)
+      .get('/')
+      .set('Accept', 'foo/bar')
+      .end(function(res){
+        res.should.have.status(302);
+        res.headers.should.have.property('location', 'http://google.com');
+        res.headers.should.not.have.property('content-type');
+        res.headers.should.have.property('content-length', '0');
+        res.body.should.equal('');
+        done();
+      })
+    })
+  })
 })