mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-17 19:21:29 +03:00
Code Activity

Fixed decompression for responses without Content-Length header (#5306)

Browse Source 
* Fixed decompression for responses without `content-length` header;

* Add Brotli encoding to the `Accept-Encoding` header only if it is supported.

* `content-length` header transformation moved up;

Co-authored-by: Jay <jasonsaayman@gmail.com>
This commit is contained in:
Dmitriy Mozgovoy
2022-12-01 16:22:20 +02:00
committed by GitHub
parent 786b113a40
commit 9041c7d272
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+16 -8
View File
@@ -20,6 +20,11 @@ import AxiosHeaders from '../core/AxiosHeaders.js';
import AxiosTransformStream from '../helpers/AxiosTransformStream.js';
import EventEmitter from 'events';
const zlibOptions = {
flush: zlib.constants.Z_SYNC_FLUSH,
finishFlush: zlib.constants.Z_SYNC_FLUSH
}
const isBrotliSupported = utils.isFunction(zlib.createBrotliDecompress);
const {http: httpFollow, https: httpsFollow} = followRedirects;
@@ -262,7 +267,7 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
}
}
const contentLength = +headers.getContentLength();
const contentLength = utils.toFiniteNumber(headers.getContentLength());
if (utils.isArray(maxRate)) {
maxUploadRate = maxRate[0];
@@ -277,7 +282,7 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
}
data = stream.pipeline([data, new AxiosTransformStream({
length: utils.toFiniteNumber(contentLength),
length: contentLength,
maxRate: utils.toFiniteNumber(maxUploadRate)
})], utils.noop);
@@ -320,7 +325,10 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
return reject(customErr);
}
headers.set('Accept-Encoding', 'gzip, deflate, br', false);
headers.set(
'Accept-Encoding',
'gzip, compress, deflate' + (isBrotliSupported ? ', br' : ''), false
);
const options = {
path,
@@ -392,17 +400,17 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
streams.push(transformStream);
}
// uncompress the response body transparently if required
// decompress the response body transparently if required
let responseStream = res;
// return the last request in case of redirects
const lastRequest = res.req || req;
// if decompress disabled we should not decompress
if (config.decompress !== false) {
if (config.decompress !== false && res.headers['content-encoding']) {
// if no content, but headers still say that it is encoded,
// remove the header not confuse downstream operations
if ((!responseLength || res.statusCode === 204) && res.headers['content-encoding']) {
if (method === 'HEAD' || res.statusCode === 204) {
delete res.headers['content-encoding'];
}
@@ -412,14 +420,14 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
case 'compress':
case 'deflate':
// add the unzipper to the body stream processing pipeline
streams.push(zlib.createUnzip());
streams.push(zlib.createUnzip(zlibOptions));
// remove the content-encoding in order to not confuse downstream operations
delete res.headers['content-encoding'];
break;
case 'br':
if (isBrotliSupported) {
streams.push(zlib.createBrotliDecompress());
streams.push(zlib.createBrotliDecompress(zlibOptions));
delete res.headers['content-encoding'];
}
}