2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-11 18:02:32 +03:00

Choose between follow-redirects or core

This commit is contained in:
dublx
2016-04-22 15:47:16 +01:00
parent 093593cbca
commit a04077a17d
2 changed files with 46 additions and 5 deletions
+20 -5
View File
@@ -3,8 +3,10 @@
var utils = require('./../utils');
var buildURL = require('./../helpers/buildURL');
var transformData = require('./../helpers/transformData');
var http = require('follow-redirects').http;
var https = require('follow-redirects').https;
var http = require('http');
var https = require('https');
var httpFollow = require('follow-redirects').http;
var httpsFollow = require('follow-redirects').https;
var url = require('url');
var zlib = require('zlib');
var pkg = require('./../../package.json');
@@ -12,7 +14,12 @@ var Buffer = require('buffer').Buffer;
// Resolve or reject the Promise based on the status
function settle(resolve, reject, response) {
(response.status >= 200 && response.status < 300 ?
var minCode = 200;
var maxCode = 300;
if (response.config.hasOwnProperty('maxRedirects')) {
maxCode = 400;
}
(response.status >= minCode && response.status < maxCode ?
resolve :
reject)(response);
}
@@ -76,8 +83,17 @@ module.exports = function httpAdapter(resolve, reject, config) {
options.path = parsed.protocol + '//' + parsed.hostname + options.path;
}
var transport;
if (config.maxRedirects === 0) {
transport = parsed.protocol === 'https:' ? https : http;
} else {
if (config.maxRedirects) {
options.maxRedirects = config.maxRedirects;
}
transport = parsed.protocol === 'https:' ? httpsFollow : httpFollow;
}
// Create the request
var transport = parsed.protocol === 'https:' ? https : http;
var req = transport.request(options, function handleResponse(res) {
if (aborted) return;
@@ -107,7 +123,6 @@ module.exports = function httpAdapter(resolve, reject, config) {
config: config,
request: req
};
if (config.responseType === 'stream') {
response.data = stream;
settle(resolve, reject, response);