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

Remember socketPath in mergeConfig

Browse Source
This commit is contained in:
Martti Laine
2018-04-10 22:29:02 +02:00
parent 143bbbe1b9
commit 4e8039ef65
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/mergeConfig.js
+2 -1
View File
@@ -37,7 +37,8 @@ module.exports = function mergeConfig(config1, config2) {
'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer', 'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName', 'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength',
'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken' 'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken',
'socketPath'
], function defaultToConfig2(prop) { ], function defaultToConfig2(prop) {
if (typeof config2[prop] !== 'undefined') { if (typeof config2[prop] !== 'undefined') {
config[prop] = config2[prop]; config[prop] = config2[prop];