skip content encoding detection for non-html/xml/plain text response
This commit is contained in:
parent
49363411f8
commit
028b8f0e4b
13
lib/body.js
13
lib/body.js
|
@ -90,12 +90,14 @@ Body.prototype._decode = function() {
|
|||
return new Body.Promise(function(resolve, reject) {
|
||||
var resTimeout;
|
||||
|
||||
// body is string
|
||||
if (typeof self.body === 'string') {
|
||||
self._bytes = self.body.length;
|
||||
self._raw = [new Buffer(self.body)];
|
||||
return resolve(self._convert());
|
||||
}
|
||||
|
||||
// body is buffer
|
||||
if (self.body instanceof Buffer) {
|
||||
self._bytes = self.body.length;
|
||||
self._raw = [self.body];
|
||||
|
@ -115,6 +117,7 @@ Body.prototype._decode = function() {
|
|||
reject(new FetchError('invalid response body at: ' + self.url + ' reason: ' + err.message, 'system', err));
|
||||
});
|
||||
|
||||
// body is stream
|
||||
self.body.on('data', function(chunk) {
|
||||
if (self._abort || chunk === null) {
|
||||
return;
|
||||
|
@ -153,12 +156,18 @@ Body.prototype._convert = function(encoding) {
|
|||
|
||||
encoding = encoding || 'utf-8';
|
||||
|
||||
var ct = this.headers.get('content-type');
|
||||
var charset = 'utf-8';
|
||||
var res, str;
|
||||
|
||||
// header
|
||||
if (this.headers.has('content-type')) {
|
||||
res = /charset=([^;]*)/i.exec(this.headers.get('content-type'));
|
||||
if (ct) {
|
||||
// skip encoding detection altogether if not html/xml/plain text
|
||||
if (!/text\/html|text\/plain|\+xml|\/xml/i.test(ct)) {
|
||||
return Buffer.concat(this._raw);
|
||||
}
|
||||
|
||||
res = /charset=([^;]*)/i.exec(ct);
|
||||
}
|
||||
|
||||
// no charset in content type, peek at response body for at most 1024 bytes
|
||||
|
|
Loading…
Reference in New Issue