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

Merge pull request #493 from mgmcdermott/master

Browse Source 
Default to using "http:" protocol in http adapter
This commit is contained in:
Matt Zabriskie
2016-10-18 12:09:51 -05:00
committed by GitHub
parent b21a280df0 7c89704262
commit b78f3fe792
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+5 -3
View File
@@ -55,6 +55,8 @@ module.exports = function httpAdapter(config) {
// Parse url // Parse url
var parsed = url.parse(config.url); var parsed = url.parse(config.url);
var protocol = parsed.protocol || 'http:';
if (!auth && parsed.auth) { if (!auth && parsed.auth) {
var urlAuth = parsed.auth.split(':'); var urlAuth = parsed.auth.split(':');
var urlUsername = urlAuth[0] || ''; var urlUsername = urlAuth[0] || '';
@@ -66,7 +68,7 @@ module.exports = function httpAdapter(config) {
delete headers.Authorization; delete headers.Authorization;
} }
var isHttps = parsed.protocol === 'https:'; var isHttps = protocol === 'https:';
var agent = isHttps ? config.httpsAgent : config.httpAgent; var agent = isHttps ? config.httpsAgent : config.httpAgent;
var options = { var options = {
@@ -81,7 +83,7 @@ module.exports = function httpAdapter(config) {
var proxy = config.proxy; var proxy = config.proxy;
if (!proxy) { if (!proxy) {
var proxyEnv = parsed.protocol.slice(0, -1) + '_proxy'; var proxyEnv = protocol.slice(0, -1) + '_proxy';
var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()]; var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()];
if (proxyUrl) { if (proxyUrl) {
var parsedProxyUrl = url.parse(proxyUrl); var parsedProxyUrl = url.parse(proxyUrl);
@@ -97,7 +99,7 @@ module.exports = function httpAdapter(config) {
options.hostname = proxy.host; options.hostname = proxy.host;
options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : ''); options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
options.port = proxy.port; options.port = proxy.port;
options.path = parsed.protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path; options.path = protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path;
} }
var transport; var transport;