Merge pull request #496 from Neopallium/master

Fix issue with 'Connection: close' in ClientRequest

src/client/parser.rs

@@ -38,19 +38,9 @@ impl HttpResponseParser {
     where
         T: IoStream,
     {
-        // if buf is empty parse_message will always return NotReady, let's avoid that
-        if buf.is_empty() {
-            match io.read_available(buf) {
-                Ok(Async::Ready((_, true))) => {
-                    return Err(HttpResponseParserError::Disconnect)
-                }
-                Ok(Async::Ready((_, false))) => (),
-                Ok(Async::NotReady) => return Ok(Async::NotReady),
-                Err(err) => return Err(HttpResponseParserError::Error(err.into())),
-            }
-        }
-
         loop {
+            // Don't call parser until we have data to parse.
+            if !buf.is_empty() {
                 match HttpResponseParser::parse_message(buf)
                     .map_err(HttpResponseParserError::Error)?
                 {
@@ -62,11 +52,16 @@ impl HttpResponseParser {
                         if buf.capacity() >= MAX_BUFFER_SIZE {
                             return Err(HttpResponseParserError::Error(ParseError::TooLarge));
                         }
+                        // Parser needs more data.
+                    }
+                }
+            }
+            // Read some more data into the buffer for the parser.
             match io.read_available(buf) {
-                        Ok(Async::Ready((_, true))) => {
+                Ok(Async::Ready((false, true))) => {
                     return Err(HttpResponseParserError::Disconnect)
                 }
-                        Ok(Async::Ready((_, false))) => (),
+                Ok(Async::Ready(_)) => (),
                 Ok(Async::NotReady) => return Ok(Async::NotReady),
                 Err(err) => {
                     return Err(HttpResponseParserError::Error(err.into()))
@@ -74,8 +69,6 @@ impl HttpResponseParser {
             }
         }
     }
-        }
-    }
 
     pub fn parse_payload<T>(
         &mut self, io: &mut T, buf: &mut BytesMut,

tests/test_client.rs

@@ -66,6 +66,16 @@ fn test_simple() {
     assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
 }
 
+#[test]
+fn test_connection_close() {
+    let mut srv =
+        test::TestServer::new(|app| app.handler(|_| HttpResponse::Ok().body(STR)));
+
+    let request = srv.get().header("Connection", "close").finish().unwrap();
+    let response = srv.execute(request.send()).unwrap();
+    assert!(response.status().is_success());
+}
+
 #[test]
 fn test_with_query_parameter() {
     let mut srv = test::TestServer::new(|app| {