Fixing http adapter to allow HTTPS connections via HTTP

axios · Jun 15, 2017 · 27375aa · 27375aa
1 parent 46e275c
commit 27375aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -14,6 +14,7 @@ export interface AxiosBasicCredentials {
 export interface AxiosProxyConfig {
   host: string;
   port: number;
+  isHttps?: boolean;
 }
 
 export interface AxiosRequestConfig {

diff --git a/lib/adapters/http.js b/lib/adapters/http.js
@@ -118,13 +118,14 @@ module.exports = function httpAdapter(config) {
     }
 
     var transport;
+    var useHttps = isHttps && proxy.isHttps;
     if (config.maxRedirects === 0) {
-      transport = isHttps ? https : http;
+      transport = useHttps ? https : http;
     } else {
       if (config.maxRedirects) {
         options.maxRedirects = config.maxRedirects;
       }
-      transport = isHttps ? httpsFollow : httpFollow;
+      transport = useHttps ? httpsFollow : httpFollow;
     }
 
     // Create the request