mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-23 20:40:40 +03:00
Code Activity

Adding responseEncoding to mergeConfig (#1745)

Browse Source 
Co-authored-by: Xianming Zhong <chinesedfan@qq.com>
This commit is contained in:
Thibault Ehrhart
2020-02-15 14:49:26 +01:00
committed by GitHub
parent 2cf6ae4608
commit 17a967123c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/mergeConfig.js
+1 -1
View File
@@ -22,7 +22,7 @@ module.exports = function mergeConfig(config1, config2) {
'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName', 'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress',
'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent', 'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent',
'httpsAgent', 'cancelToken', 'socketPath' 'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
]; ];
utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) { utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {