Merge pull request expressjs#1747 from sorribas/master

res.format() now includes charset.
zmrzwj · Sep 8, 2013 · 1c87e5e · 1c87e5e
2 parents b66c7da + a887e6a
commit 1c87e5e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -468,7 +468,12 @@ res.format = function(obj){
   this.vary("Accept");
 
   if (key) {
-    this.set('Content-Type', normalizeType(key).value);
+    var type = normalizeType(key).value;
+    var charset = mime.charsets.lookup(type);
+    if (charset) {
+      type += '; charset=' + charset;
+    }
+    this.set('Content-Type', type);
     obj[key](req, this, next);
   } else if (fn) {
     fn();

diff --git a/test/res.format.js b/test/res.format.js
@@ -93,10 +93,27 @@ function test(app) {
     request(app)
     .get('/')
     .set('Accept', 'text/html; q=.5, text/plain')
-    .expect('Content-Type', 'text/plain')
+    .expect('Content-Type', 'text/plain; charset=UTF-8')
     .expect('hey', done);
   })
 
+  it('should set the correct  charset for the Content-Type', function() {
+    request(app)
+    .get('/')
+    .set('Accept', 'text/html')
+    .expect('Content-Type', 'text/html; charset=UTF-8');
+
+    request(app)
+    .get('/')
+    .set('Accept', 'text/plain')
+    .expect('Content-Type', 'text/plain; charset=UTF-8');
+
+    request(app)
+    .get('/')
+    .set('Accept', 'application/json')
+    .expect('Content-Type', 'application/json');
+  })
+
   it('should Vary: Accept', function(done){
     request(app)
     .get('/')