From aeeff40c9528e2ef9cbbf42f7c96f66f06b1e8b7 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Sat, 5 Dec 2020 23:30:26 -0500
Subject: [PATCH] Fix 307/308 redirects (again)

- Add unit test
- Use the original method instead of hard-coding GET
---
 src/test/redirect.rs | 14 ++++++++++++++
 src/unit.rs          |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/redirect.rs b/src/test/redirect.rs
index 7a88a79..d360702 100644
--- a/src/test/redirect.rs
+++ b/src/test/redirect.rs
@@ -127,3 +127,17 @@ fn redirect_post() {
     assert!(resp.has("x-foo"));
     assert_eq!(resp.header("x-foo").unwrap(), "bar");
 }
+
+#[test]
+fn redirect_308() {
+    test::set_handler("/redirect_get3", |_| {
+        test::make_response(308, "Go here", vec!["Location: /valid_response"], vec![])
+    });
+    test::set_handler("/valid_response", |unit| {
+        assert_eq!(unit.method, "GET");
+        test::make_response(200, "OK", vec![], vec![])
+    });
+    let resp = get("test://host/redirect_get3").call().unwrap();
+    assert_eq!(resp.status(), 200);
+    assert_eq!(resp.get_url(), "test://host/valid_response");
+}
diff --git a/src/unit.rs b/src/unit.rs
index 1d4014f..22e6ce3 100644
--- a/src/unit.rs
+++ b/src/unit.rs
@@ -271,7 +271,9 @@ pub(crate) fn connect(
                 307 | 308 if ["GET", "HEAD", "OPTIONS", "TRACE"].contains(&method.as_str()) => {
                     let empty = Payload::Empty.into_read();
                     debug!("redirect {} {} -> {}", resp.status(), url, new_url);
-                    return connect(unit, use_pooled, empty, Some(Arc::new(resp)));
+                    // recreate the unit to get a new hostname and cookies for the new host.
+                    let new_unit = Unit::new(&unit.agent, &unit.method, &new_url, &unit.headers, &empty);
+                    return connect(new_unit, use_pooled, empty, Some(Arc::new(resp)));
                 }
                 _ => (),
             };