Merge pull request #50 from adamreichold/bring-back-timeout-check

Make sure to timeouts do not look like normal EOF.

src/streams.rs

@@ -68,6 +68,7 @@ impl BaseStream {
                 let (tx, rx) = mpsc::channel();
                 thread::spawn(move || {
                     if let Err(mpsc::RecvTimeoutError::Timeout) = rx.recv_timeout(timeout) {
+                        drop(rx);
                         let _ = stream.shutdown(Shutdown::Both);
                     }
                 });
@@ -112,9 +113,9 @@ impl Read for BaseStream {
     #[inline]
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         match self {
-            BaseStream::Plain { stream, .. } => stream.read(buf),
+            BaseStream::Plain { stream, timeout } => read_timeout(stream, buf, timeout),
             #[cfg(feature = "tls")]
-            BaseStream::Tls { stream, .. } => stream.read(buf),
+            BaseStream::Tls { stream, timeout } => read_timeout(stream, buf, timeout),
             #[cfg(test)]
             BaseStream::Mock(s) => s.read(buf),
         }
@@ -144,3 +145,15 @@ impl Write for BaseStream {
         }
     }
 }
+
+fn read_timeout(mut stream: impl Read, buf: &mut [u8], timeout: &Option<mpsc::Sender<()>>) -> io::Result<usize> {
+    let read = stream.read(buf)?;
+
+    if let Some(timeout) = timeout {
+        if read == 0 && !buf.is_empty() && timeout.send(()).is_err() {
+            return Err(io::ErrorKind::TimedOut.into());
+        }
+    }
+
+    Ok(read)
+}

tests/test_timeout.rs

@@ -46,7 +46,7 @@ fn request_fails_due_to_timeout() {
     match result {
         Err(err) => match err.kind() {
             attohttpc::ErrorKind::Io(err) => match err.kind() {
-                io::ErrorKind::UnexpectedEof => (),
+                io::ErrorKind::TimedOut => (),
                 err => panic!("Unexpected I/O error: {:?}", err),
             },
             err => panic!("Unexpected error: {:?}", err),