mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Replacing 'agent' option with 'httpAgent' and 'httpsAgent'
This commit is contained in:
@@ -61,13 +61,17 @@ module.exports = function httpAdapter(config) {
|
|||||||
var urlPassword = urlAuth[1] || '';
|
var urlPassword = urlAuth[1] || '';
|
||||||
auth = urlUsername + ':' + urlPassword;
|
auth = urlUsername + ':' + urlPassword;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var isHttps = parsed.protocol === 'https:';
|
||||||
|
var agent = isHttps ? config.httpsAgent : config.httpAgent;
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
hostname: parsed.hostname,
|
hostname: parsed.hostname,
|
||||||
port: parsed.port,
|
port: parsed.port,
|
||||||
path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
|
path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
|
||||||
method: config.method,
|
method: config.method,
|
||||||
headers: headers,
|
headers: headers,
|
||||||
agent: config.agent,
|
agent: agent,
|
||||||
auth: auth
|
auth: auth
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -79,12 +83,12 @@ module.exports = function httpAdapter(config) {
|
|||||||
|
|
||||||
var transport;
|
var transport;
|
||||||
if (config.maxRedirects === 0) {
|
if (config.maxRedirects === 0) {
|
||||||
transport = parsed.protocol === 'https:' ? https : http;
|
transport = isHttps ? https : http;
|
||||||
} else {
|
} else {
|
||||||
if (config.maxRedirects) {
|
if (config.maxRedirects) {
|
||||||
options.maxRedirects = config.maxRedirects;
|
options.maxRedirects = config.maxRedirects;
|
||||||
}
|
}
|
||||||
transport = parsed.protocol === 'https:' ? httpsFollow : httpFollow;
|
transport = isHttps ? httpsFollow : httpFollow;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create the request
|
// Create the request
|
||||||
|
|||||||
Reference in New Issue
Block a user