Fix requests failing with 'operation would block'

src/server.rs

@@ -1,6 +1,6 @@
 use crate::protocol::*;
 use mime::Mime;
-use std::io::{self, BufRead, Read, Write};
+use std::io::{self, BufRead, Write};
 use std::{net, str::FromStr, sync::Arc};
 use url::Url;
 
@@ -15,15 +15,29 @@ impl Server {
         let (mut stream, _) = self.listener.accept()?;
         let mut conn = rustls::ServerConnection::new(Arc::new(self.tls_config.clone()))?;
 
-        conn.complete_io(&mut stream)?;
+        loop {
-        let response = read_request(conn.reader())?.process();
+            conn.complete_io(&mut stream)?;
+            let request = match read_request(conn.reader()) {
+                Ok(r) => r,
+                // This is the best way I can find to verify it's an
+                // ErrorKind::WouldBlock. But to be honest this whole way of
+                // having it in a loop to fix the blocking problem is a bodge.
+                // There's probably a Correct Way to fix it.
+                Err(RequestParseError::Error(e)) if e.to_string() == "operation would block" => {
+                    continue
+                }
+                Err(e) => return Err(Box::new(e)),
+            };
+            let response = request.process();
 
-        conn.writer()
+            conn.writer()
-            .write_all(response.serialize().as_slice())
+                .write_all(response.serialize().as_slice())
-            .expect("23");
+                .expect("23");
-        conn.complete_io(&mut stream)?;
+            conn.send_close_notify();
+            conn.complete_io(&mut stream)?;
 
-        Ok(())
+            return Ok(());
+        }
     }
 }