diff --git a/darkhttpd.c b/darkhttpd.c
index c1cde49..3686d71 100644
--- a/darkhttpd.c
+++ b/darkhttpd.c
@@ -1370,8 +1370,10 @@ static char *parse_field(const struct connection *conn, const char *field) {
 
     /* find end */
     for (bound2 = bound1;
-        (conn->request[bound2] != '\r') &&
-        (bound2 < conn->request_length); bound2++)
+         ((conn->request[bound2] != '\r') &&
+          (conn->request[bound2] != '\n') &&
+          (bound2 < conn->request_length));
+         bound2++)
             ;
 
     /* copy to buffer */