diff --git a/node_modules/express/lib/response.js b/node_modules/express/lib/response.js index dd7b3c8..a339896 100644 --- a/node_modules/express/lib/response.js +++ b/node_modules/express/lib/response.js @@ -27,7 +27,6 @@ var merge = require('utils-merge'); var sign = require('cookie-signature').sign; var normalizeType = require('./utils').normalizeType; var normalizeTypes = require('./utils').normalizeTypes; -var setCharset = require('./utils').setCharset; var cookie = require('cookie'); var send = require('send'); var extname = path.extname; @@ -54,7 +53,6 @@ module.exports = res * @private */ -var charsetRegExp = /;\s*charset\s*=/; var schemaAndHostRegExp = /^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?\/\/[^\\\/\?]+/; /** @@ -165,16 +163,6 @@ res.send = function send(body) { break; } - // write strings in utf-8 - if (typeof chunk === 'string') { - encoding = 'utf8'; - type = this.get('Content-Type'); - - // reflect this in content-type - if (typeof type === 'string') { - this.set('Content-Type', setCharset(type, 'utf-8')); - } - } // determine if ETag should be generated var etagFn = app.get('etag fn') @@ -781,17 +769,6 @@ res.header = function header(field, val) { ? val.map(String) : String(val); - // add charset to content-type - if (field.toLowerCase() === 'content-type') { - if (Array.isArray(value)) { - throw new TypeError('Content-Type cannot be set to an Array'); - } - if (!charsetRegExp.test(value)) { - var charset = mime.charsets.lookup(value.split(';')[0]); - if (charset) value += '; charset=' + charset.toLowerCase(); - } - } - this.setHeader(field, value); } else { for (var key in field) {