|
|
@@ -1,55 +0,0 @@ |
|
|
diff --git a/node_modules/axios/lib/adapters/http.js b/node_modules/axios/lib/adapters/http.js |
|
|
|
|
|
index 16dad12..0330430 100644 |
|
|
|
|
|
--- a/node_modules/axios/lib/adapters/http.js |
|
|
|
|
|
+++ b/node_modules/axios/lib/adapters/http.js |
|
|
|
|
|
@@ -16,6 +16,31 @@ var enhanceError = require('../core/enhanceError'); |
|
|
|
|
|
|
|
|
|
|
|
var isHttps = /https:?/; |
|
|
|
|
|
|
|
|
|
|
|
+/** |
|
|
|
|
|
+ * |
|
|
|
|
|
+ * @param {http.ClientRequestArgs} options |
|
|
|
|
|
+ * @param {AxiosProxyConfig} proxy |
|
|
|
|
|
+ * @param {string} location |
|
|
|
|
|
+ */ |
|
|
|
|
|
+function setProxy(options, proxy, location) { |
|
|
|
|
|
+ options.hostname = proxy.host; |
|
|
|
|
|
+ options.host = proxy.host; |
|
|
|
|
|
+ options.port = proxy.port; |
|
|
|
|
|
+ options.path = location; |
|
|
|
|
|
+ |
|
|
|
|
|
+ // Basic proxy authorization |
|
|
|
|
|
+ if (proxy.auth) { |
|
|
|
|
|
+ var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64'); |
|
|
|
|
|
+ options.headers['Proxy-Authorization'] = 'Basic ' + base64; |
|
|
|
|
|
+ } |
|
|
|
|
|
+ |
|
|
|
|
|
+ // If a proxy is used, any redirects must also pass through the proxy |
|
|
|
|
|
+ options.beforeRedirect = function beforeRedirect(redirection) { |
|
|
|
|
|
+ redirection.headers.host = redirection.host; |
|
|
|
|
|
+ setProxy(redirection, proxy, redirection.href); |
|
|
|
|
|
+ }; |
|
|
|
|
|
+} |
|
|
|
|
|
+ |
|
|
|
|
|
/*eslint consistent-return:0*/ |
|
|
|
|
|
module.exports = function httpAdapter(config) { |
|
|
|
|
|
return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) { |
|
|
|
|
|
@@ -145,17 +170,8 @@ module.exports = function httpAdapter(config) { |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (proxy) { |
|
|
|
|
|
- options.hostname = proxy.host; |
|
|
|
|
|
- options.host = proxy.host; |
|
|
|
|
|
options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : ''); |
|
|
|
|
|
- options.port = proxy.port; |
|
|
|
|
|
- options.path = protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path; |
|
|
|
|
|
- |
|
|
|
|
|
- // Basic proxy authorization |
|
|
|
|
|
- if (proxy.auth) { |
|
|
|
|
|
- var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64'); |
|
|
|
|
|
- options.headers['Proxy-Authorization'] = 'Basic ' + base64; |
|
|
|
|
|
- } |
|
|
|
|
|
+ setProxy(options, proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var transport; |
|
|
|