Reselect agent on redirect from http to https

Closes #80
sindresorhus · Jul 14, 2015 · b9c33aa · b9c33aa
1 parent 75cbd91
commit b9c33aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -148,7 +148,11 @@ function got(url, opts, cb) {
 				}
 
 				var redirectUrl = urlLib.resolve(url, res.headers.location);
-				var redirectOpts = objectAssign(opts, urlLib.parse(redirectUrl));
+				var redirectOpts = objectAssign({}, opts, urlLib.parse(redirectUrl));
+
+				if (opts.agent === infinityAgent.http.globalAgent && redirectOpts.protocol === 'https:' && opts.protocol === 'http:') {
+					redirectOpts.agent = undefined;
+				}
 
 				if (proxy) {
 					proxy.emit('redirect', res, redirectOpts);

diff --git a/test/test-https.js b/test/test-https.js
@@ -55,6 +55,14 @@ test('setup', function (t) {
 	});
 });
 
+test('redirects from http to https works', function (t) {
+	got('http://github.com', function (err, data) {
+		t.error(err);
+		t.ok(data);
+		t.end();
+	});
+});
+
 test('make request to https server', function (t) {
 	got('https://google.com', {
 		strictSSL: true