agate

commit cac7e394be426388b4ec66d7bcda3dfb073f6f75
parent a049beb66b84a9f120381e48a055042661004bef
Author: Matt Brubeck <mbrubeck@limpet.net>
Date:   Fri, 22 May 2020 15:26:16 -0700

Minor cleanup in parse_request

Diffstat:
M
src/main.rs
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -89,14 +89,13 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> Result<Url> {
     while !buf.is_empty() {
         let n = stream.read(buf).await?;
         len += n;
-        if n == 0 || request[..len].ends_with(b"\r\n") {
+        if request[..len].ends_with(b"\r\n") {
             break;
+        } else if n == 0 {
+            Err("Request ended unexpectedly")?
         }
         buf = &mut request[len..];
     }
-    if !request[..len].ends_with(b"\r\n") {
-        Err("Missing CRLF")?
-    }
     let request = str::from_utf8(&request[..len - 2])?;
 
     let url = if request.starts_with("//") {