Merge pull request #1 from mhassan1/issue-2546-0.19.1

Correctly pass agents to follow-redirects
axios · Nov 16, 2019 · 59c3881 · 59c3881
2 parents fd81cc8 + 945e468
commit 59c3881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,7 @@ Fixes and Functionallity:
 - Add error toJSON example (#2466)[https://github.com/axios/axios/pull/2466]
 - Fixing Vulnerability A Fortify Scan finds a critical Cross-Site Scrip… (#2451)[https://github.com/axios/axios/pull/2451]
 - Fixing subdomain handling on no_proxy (#2442)[https://github.com/axios/axios/pull/2442]
-- Make redirection from HTTP to HTTPS work (#2426)[https://github.com/axios/axios/pull/2426]
+- Make redirection from HTTP to HTTPS work (#2426)[https://github.com/axios/axios/pull/2426] and (#2547)[https://github.com/axios/axios/pull/2547]
 - Add toJSON property to AxiosError type (#2427)[https://github.com/axios/axios/pull/2427]
 - Fixing socket hang up error on node side for slow response. (#1752)[https://github.com/axios/axios/pull/1752]
 - Alternative syntax to send data into the body (#2317)[https://github.com/axios/axios/pull/2317]

diff --git a/lib/adapters/http.js b/lib/adapters/http.js
@@ -86,8 +86,8 @@ module.exports = function httpAdapter(config) {
       headers: headers,
       agent: agent,
       agents: {
-        httpsAgent: config.httpsAgent,
-        httpAgent: config.httpAgent
+        https: config.httpsAgent,
+        http: config.httpAgent
       },
       auth: auth
     };