Legend:
- Unmodified
- Added
- Removed
-
imaps-frontend/node_modules/axios/lib/core/mergeConfig.js
rd565449 r0c6b92a 20 20 const config = {}; 21 21 22 function getMergedValue(target, source, caseless) {22 function getMergedValue(target, source, prop, caseless) { 23 23 if (utils.isPlainObject(target) && utils.isPlainObject(source)) { 24 24 return utils.merge.call({caseless}, target, source); … … 32 32 33 33 // eslint-disable-next-line consistent-return 34 function mergeDeepProperties(a, b, caseless) {34 function mergeDeepProperties(a, b, prop , caseless) { 35 35 if (!utils.isUndefined(b)) { 36 return getMergedValue(a, b, caseless);36 return getMergedValue(a, b, prop , caseless); 37 37 } else if (!utils.isUndefined(a)) { 38 return getMergedValue(undefined, a, caseless);38 return getMergedValue(undefined, a, prop , caseless); 39 39 } 40 40 } … … 94 94 responseEncoding: defaultToConfig2, 95 95 validateStatus: mergeDirectKeys, 96 headers: (a, b ) => mergeDeepProperties(headersToObject(a), headersToObject(b), true)96 headers: (a, b , prop) => mergeDeepProperties(headersToObject(a), headersToObject(b),prop, true) 97 97 }; 98 98
Note:
See TracChangeset
for help on using the changeset viewer.