update

Author: 0x676e67

src/redirect.rs

@@ -54,7 +54,8 @@ pub struct Action {
 #[derive(Clone, Debug)]
 pub struct History {
     status: StatusCode,
-    uri: Uri,
+    location: Uri,
+    previous: Uri,
     headers: HeaderMap,
 }
 
@@ -238,20 +239,29 @@ impl<'a> Attempt<'a> {
 // ===== impl History =====
 
 impl History {
-    /// Get the status code of the redirect response.
+    /// Returns the redirection response.
+    #[inline(always)]
     pub fn status(&self) -> StatusCode {
         self.status
     }
 
-    /// Get the URI of the redirect response.
-    pub fn uri(&self) -> &Uri {
-        &self.uri
-    }
-
-    /// Get the headers of the redirect response.
+    /// Returns the headers of the redirection response.
+    #[inline(always)]
     pub fn headers(&self) -> &HeaderMap {
         &self.headers
     }
+
+    /// Returns the destination URI of the redirection.
+    #[inline(always)]
+    pub fn location(&self) -> &Uri {
+        &self.location
+    }
+
+    /// Returns the URI of the original request.
+    #[inline(always)]
+    pub fn previous(&self) -> &Uri {
+        &self.previous
+    }
 }
 
 #[derive(Clone)]
@@ -385,7 +395,8 @@ impl policy::Policy<Body, BoxError> for FollowRedirectPolicy {
                         .get_or_insert_with(Vec::new)
                         .push(History {
                             status: attempt.status(),
-                            uri: attempt.location().clone(),
+                            location: attempt.location().clone(),
+                            previous: attempt.previous().clone(),
                             headers: attempt.headers().clone(),
                         });
                 }

tests/redirect.rs

@@ -498,10 +498,19 @@ async fn test_redirect_history() {
         &"test-dst"
     );
 
-    let history = res.history().collect::<Vec<_>>();
-    assert_eq!(history.len(), 2);
-    assert_eq!(history[0].status(), 302);
-    assert_eq!(history[0].uri().path(), "/second");
-    assert_eq!(history[1].status(), 302);
-    assert_eq!(history[1].uri().path(), "/dst");
+    let mut history = res.history();
+
+    let next1 = history.next().unwrap();
+    assert_eq!(next1.status(), 302);
+    assert_eq!(next1.previous().path(), "/first");
+    assert_eq!(next1.location().path(), "/second");
+    assert_eq!(next1.headers()["location"], "/second");
+
+    let next2 = history.next().unwrap();
+    assert_eq!(next2.status(), 302);
+    assert_eq!(next2.previous().path(), "/second");
+    assert_eq!(next2.location().path(), "/dst");
+    assert_eq!(next2.headers()["location"], "/dst");
+
+    assert!(history.next().is_none());
 }