From 31504388d73e9ffa689bd61419fac33bc942a7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=A4iv=C3=A4rinta?=
 <mattias-p@users.noreply.github.com>
Date: Mon, 16 Apr 2018 00:11:50 +0200
Subject: [PATCH] Add status code accessor to RedirectAttempt (#285)

---
 src/async_impl/client.rs |  7 +++++-
 src/redirect.rs          | 51 ++++++++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs
index 9d1d57c..8fff979 100644
--- a/src/async_impl/client.rs
+++ b/src/async_impl/client.rs
@@ -539,7 +539,12 @@ impl Future for PendingRequest {
                         }
                     }
                     self.urls.push(self.url.clone());
-                    let action = check_redirect(&self.client.redirect_policy, &loc, &self.urls);
+                    let action = check_redirect(
+                        &self.client.redirect_policy,
+                        res.status(),
+                        &loc,
+                        &self.urls,
+                    );
 
                     match action {
                         redirect::Action::Follow => {
diff --git a/src/redirect.rs b/src/redirect.rs
index 4c8f290..543987a 100644
--- a/src/redirect.rs
+++ b/src/redirect.rs
@@ -1,6 +1,7 @@
 use std::fmt;
 
-use hyper::header::{Headers};
+use hyper::header::Headers;
+use hyper::StatusCode;
 
 use Url;
 
@@ -17,6 +18,7 @@ pub struct RedirectPolicy {
 /// in redirect chain.
 #[derive(Debug)]
 pub struct RedirectAttempt<'a> {
+    status: StatusCode,
     next: &'a Url,
     previous: &'a [Url],
 }
@@ -105,7 +107,7 @@ impl RedirectPolicy {
     /// #
     /// # fn run() -> Result<(), Error> {
     /// let custom = RedirectPolicy::custom(|attempt| {
-    ///     eprintln!("Location: {:?}", attempt.url());
+    ///     eprintln!("{}, Location: {:?}", attempt.status(), attempt.url());
     ///     RedirectPolicy::default().redirect(attempt)
     /// });
     /// # Ok(())
@@ -135,6 +137,11 @@ impl Default for RedirectPolicy {
 }
 
 impl<'a> RedirectAttempt<'a> {
+    /// Get the type of redirect.
+    pub fn status(&self) -> StatusCode {
+        self.status
+    }
+
     /// Get the next URL to redirect to.
     pub fn url(&self) -> &Url {
         self.next
@@ -206,11 +213,19 @@ pub enum Action {
 }
 
 #[inline]
-pub fn check_redirect(policy: &RedirectPolicy, next: &Url, previous: &[Url]) -> Action {
-    policy.redirect(RedirectAttempt {
-        next: next,
-        previous: previous,
-    }).inner
+pub fn check_redirect(
+    policy: &RedirectPolicy,
+    status: StatusCode,
+    next: &Url,
+    previous: &[Url],
+) -> Action {
+    policy
+        .redirect(RedirectAttempt {
+            status: status,
+            next: next,
+            previous: previous,
+        })
+        .inner
 }
 
 pub fn remove_sensitive_headers(headers: &mut Headers, next: &Url, previous: &[Url]) {
@@ -252,13 +267,17 @@ fn test_redirect_policy_limit() {
         .map(|i| Url::parse(&format!("http://a.b/c/{}", i)).unwrap())
         .collect::<Vec<_>>();
 
-
-    assert_eq!(check_redirect(&policy, &next, &previous), Action::Follow);
+    assert_eq!(
+        check_redirect(&policy, StatusCode::Found, &next, &previous),
+        Action::Follow
+    );
 
     previous.push(Url::parse("http://a.b.d/e/33").unwrap());
 
-    assert_eq!(check_redirect(&policy, &next, &previous),
-               Action::TooManyRedirects);
+    assert_eq!(
+        check_redirect(&policy, StatusCode::Found, &next, &previous),
+        Action::TooManyRedirects
+    );
 }
 
 #[test]
@@ -272,10 +291,16 @@ fn test_redirect_policy_custom() {
     });
 
     let next = Url::parse("http://bar/baz").unwrap();
-    assert_eq!(check_redirect(&policy, &next, &[]), Action::Follow);
+    assert_eq!(
+        check_redirect(&policy, StatusCode::Found, &next, &[]),
+        Action::Follow
+    );
 
     let next = Url::parse("http://foo/baz").unwrap();
-    assert_eq!(check_redirect(&policy, &next, &[]), Action::Stop);
+    assert_eq!(
+        check_redirect(&policy, StatusCode::Found, &next, &[]),
+        Action::Stop
+    );
 }
 
 #[test]