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

Fixed merge conflicts

Browse Source
This commit is contained in:
Jay
2022-04-01 18:40:12 +02:00
parent c855c9d385 6b9b05b907
commit 8699891b8e
22 changed files with 644 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+4 -1
View File
@@ -86,7 +86,10 @@ module.exports = function httpAdapter(config) {
headers['User-Agent'] = 'axios/' + VERSION;
}
if (data && !utils.isStream(data)) {
// support for https://www.npmjs.com/package/form-data api
if (utils.isFormData(data) && utils.isFunction(data.getHeaders)) {
Object.assign(headers, data.getHeaders());
} else if (data && !utils.isStream(data)) {
if (Buffer.isBuffer(data)) {
// Nothing to do...
} else if (utils.isArrayBuffer(data)) {