mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Merge pull request #887 from fgnass/no-buffer-in-browser
No buffer in browser
This commit is contained in:
@@ -10,7 +10,6 @@ var httpsFollow = require('follow-redirects').https;
|
|||||||
var url = require('url');
|
var url = require('url');
|
||||||
var zlib = require('zlib');
|
var zlib = require('zlib');
|
||||||
var pkg = require('./../../package.json');
|
var pkg = require('./../../package.json');
|
||||||
var Buffer = require('buffer').Buffer;
|
|
||||||
var createError = require('../core/createError');
|
var createError = require('../core/createError');
|
||||||
var enhanceError = require('../core/enhanceError');
|
var enhanceError = require('../core/enhanceError');
|
||||||
|
|
||||||
@@ -30,7 +29,7 @@ module.exports = function httpAdapter(config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (data && !utils.isStream(data)) {
|
if (data && !utils.isStream(data)) {
|
||||||
if (utils.isBuffer(data)) {
|
if (Buffer.isBuffer(data)) {
|
||||||
// Nothing to do...
|
// Nothing to do...
|
||||||
} else if (utils.isArrayBuffer(data)) {
|
} else if (utils.isArrayBuffer(data)) {
|
||||||
data = new Buffer(new Uint8Array(data));
|
data = new Buffer(new Uint8Array(data));
|
||||||
|
|||||||
+1
-10
@@ -1,6 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var bind = require('./helpers/bind');
|
var bind = require('./helpers/bind');
|
||||||
|
var isBuffer = require('is-buffer');
|
||||||
|
|
||||||
/*global toString:true*/
|
/*global toString:true*/
|
||||||
|
|
||||||
@@ -18,16 +19,6 @@ function isArray(val) {
|
|||||||
return toString.call(val) === '[object Array]';
|
return toString.call(val) === '[object Array]';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if a value is a Node Buffer
|
|
||||||
*
|
|
||||||
* @param {Object} val The value to test
|
|
||||||
* @returns {boolean} True if value is a Node Buffer, otherwise false
|
|
||||||
*/
|
|
||||||
function isBuffer(val) {
|
|
||||||
return ((typeof Buffer !== 'undefined') && (Buffer.isBuffer) && (Buffer.isBuffer(val)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine if a value is an ArrayBuffer
|
* Determine if a value is an ArrayBuffer
|
||||||
*
|
*
|
||||||
|
|||||||
+2
-1
@@ -72,6 +72,7 @@
|
|||||||
},
|
},
|
||||||
"typings": "./index.d.ts",
|
"typings": "./index.d.ts",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.2.3"
|
"follow-redirects": "^1.2.3",
|
||||||
|
"is-buffer": "^1.1.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user