JSON and JSONP default to UTF-8 in the same way as HTML. Closes expre…

…ssjs#632. Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
jimmynicol · Apr 20, 2011 · 3afbcd0 · 3afbcd0
1 parent 8f054db
commit 3afbcd0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -63,7 +63,7 @@ res.send = function(body, headers, status){
       break;
     case 'string':
       if (!this.header('Content-Type')) {
-        this.charset = this.charset || this.app.set('charset') || 'utf-8';
+        this.charset = this.charset || 'utf-8';
         this.contentType('.html');
       }
       break;
@@ -75,12 +75,12 @@ res.send = function(body, headers, status){
         }
       } else {
         if (!this.header('Content-Type')) {
-          this.charset = this.charset || this.app.set('charset') || 'utf-8';
+          this.charset = this.charset || 'utf-8';
           this.contentType('.json');
         }
         body = JSON.stringify(body);
         if (this.req.query.callback && this.app.set('jsonp callback')) {
-          this.charset = this.charset || this.app.set('charset') || 'utf-8';
+          this.charset = this.charset || 'utf-8';
           this.header('Content-Type', 'text/javascript');
           body = this.req.query.callback.replace(/[^\w$.]/g, '') + '(' + body + ');';
         }