Merge pull request #77 from Fishrock123/fix-h1-connection-pooling

fix: properly check if connections can be recycled

Author: Fishrock123

src/h1/tcp.rs

@@ -63,7 +63,15 @@ impl Manager<TcpStream, std::io::Error> for TcpConnection {
 
     async fn recycle(&self, conn: &mut TcpStream) -> RecycleResult<std::io::Error> {
         let mut buf = [0; 4];
-        conn.peek(&mut buf[..]).await?;
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        match Pin::new(conn).poll_read(&mut cx, &mut buf) {
+            Poll::Ready(Err(error)) => Err(error),
+            Poll::Ready(Ok(bytes)) if bytes == 0 => Err(std::io::Error::new(
+                std::io::ErrorKind::UnexpectedEof,
+                "connection appeared to be closed (EoF)",
+            )),
+            _ => Ok(()),
+        }?;
         Ok(())
     }
 }

src/h1/tls.rs

@@ -76,10 +76,16 @@ impl Manager<TlsStream<TcpStream>, Error> for TlsConnection {
 
     async fn recycle(&self, conn: &mut TlsStream<TcpStream>) -> RecycleResult<Error> {
         let mut buf = [0; 4];
-        conn.get_ref()
-            .peek(&mut buf[..])
-            .await
-            .map_err(Error::from)?;
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        match Pin::new(conn).poll_read(&mut cx, &mut buf) {
+            Poll::Ready(Err(error)) => Err(error),
+            Poll::Ready(Ok(bytes)) if bytes == 0 => Err(std::io::Error::new(
+                std::io::ErrorKind::UnexpectedEof,
+                "connection appeared to be closed (EoF)",
+            )),
+            _ => Ok(()),
+        }
+        .map_err(Error::from)?;
         Ok(())
     }
 }

tests/test.rs

@@ -135,3 +135,17 @@ SOFTWARE.
 
     Ok(())
 }
+
+#[atest]
+async fn keep_alive() {
+    let _mock_guard = mockito::mock("GET", "/report")
+        .with_status(200)
+        .expect_at_least(2)
+        .create();
+
+    let client = DefaultClient::new();
+    let url: Url = format!("{}/report", mockito::server_url()).parse().unwrap();
+    let req = Request::new(http_types::Method::Get, url);
+    client.send(req.clone()).await.unwrap();
+    client.send(req.clone()).await.unwrap();
+}