From c5fa6c1abe686ce9afc5a0fd456b1325dab54a01 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 1 Apr 2019 11:29:26 -0700
Subject: [PATCH] do not consume response

---
 awc/CHANGES.md      |  7 +++++++
 awc/Cargo.toml      |  2 +-
 awc/src/lib.rs      |  2 +-
 awc/src/response.rs | 17 +++++++++--------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 6e472035..9ca5b22d 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -7,6 +7,13 @@
 
 * Added `Deref<Target = RequestHead>` for `ClientRequest`.
 
+* Export `MessageBody` type
+
+
+### Changed
+
+* `ClientResponse::body()` does not consume response object.
+
 
 ## [0.1.0-alpha.2] - 2019-03-29
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index c2cc9e7f..ef9143ec 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "0.1.0-alpha.2"
+version = "0.1.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http client."
 readme = "README.md"
diff --git a/awc/src/lib.rs b/awc/src/lib.rs
index ff1fb3fe..e2c04dbb 100644
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -39,7 +39,7 @@ pub mod ws;
 
 pub use self::builder::ClientBuilder;
 pub use self::request::ClientRequest;
-pub use self::response::ClientResponse;
+pub use self::response::{ClientResponse, MessageBody};
 
 use self::connect::{Connect, ConnectorWrapper};
 
diff --git a/awc/src/response.rs b/awc/src/response.rs
index 038a9a33..2548d719 100644
--- a/awc/src/response.rs
+++ b/awc/src/response.rs
@@ -105,7 +105,7 @@ where
     S: Stream<Item = Bytes, Error = PayloadError> + 'static,
 {
     /// Load http response's body.
-    pub fn body(self) -> MessageBody<S> {
+    pub fn body(&mut self) -> MessageBody<S> {
         MessageBody::new(self)
     }
 }
@@ -137,7 +137,7 @@ impl<S> fmt::Debug for ClientResponse<S> {
 pub struct MessageBody<S> {
     limit: usize,
     length: Option<usize>,
-    stream: Option<ClientResponse<S>>,
+    stream: Option<Payload<S>>,
     err: Option<PayloadError>,
     fut: Option<Box<Future<Item = Bytes, Error = PayloadError>>>,
 }
@@ -147,7 +147,7 @@ where
     S: Stream<Item = Bytes, Error = PayloadError> + 'static,
 {
     /// Create `MessageBody` for request.
-    pub fn new(res: ClientResponse<S>) -> MessageBody<S> {
+    pub fn new(res: &mut ClientResponse<S>) -> MessageBody<S> {
         let mut len = None;
         if let Some(l) = res.headers().get(CONTENT_LENGTH) {
             if let Ok(s) = l.to_str() {
@@ -164,7 +164,7 @@ where
         MessageBody {
             limit: 262_144,
             length: len,
-            stream: Some(res),
+            stream: Some(res.take_payload()),
             fut: None,
             err: None,
         }
@@ -239,19 +239,20 @@ mod tests {
 
     #[test]
     fn test_body() {
-        let req = TestResponse::with_header(header::CONTENT_LENGTH, "xxxx").finish();
+        let mut req = TestResponse::with_header(header::CONTENT_LENGTH, "xxxx").finish();
         match req.body().poll().err().unwrap() {
             PayloadError::UnknownLength => (),
             _ => unreachable!("error"),
         }
 
-        let req = TestResponse::with_header(header::CONTENT_LENGTH, "1000000").finish();
+        let mut req =
+            TestResponse::with_header(header::CONTENT_LENGTH, "1000000").finish();
         match req.body().poll().err().unwrap() {
             PayloadError::Overflow => (),
             _ => unreachable!("error"),
         }
 
-        let req = TestResponse::default()
+        let mut req = TestResponse::default()
             .set_payload(Bytes::from_static(b"test"))
             .finish();
         match req.body().poll().ok().unwrap() {
@@ -259,7 +260,7 @@ mod tests {
             _ => unreachable!("error"),
         }
 
-        let req = TestResponse::default()
+        let mut req = TestResponse::default()
             .set_payload(Bytes::from_static(b"11111111111111"))
             .finish();
         match req.body().limit(5).poll().err().unwrap() {