diff --git a/mongoose.c b/mongoose.c
index ebd89c7a..695ee17a 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -1439,11 +1439,11 @@ static bool mg_http_parse_headers(const char *s, const char *end,
     const char *he = skip(s, end, "\r\n", &tmp);
     if (tmp.len == 0) break;  // empty header = EOH
     s = skip(s, he, ": \r\n", &k);
+    if (k.ptr[k.len] != ':') return false;  // Invalid header
     s = skip(s, he, "\r\n", &v);
-    if (k.len == tmp.len) continue;
     while (v.len > 0 && v.ptr[v.len - 1] == ' ') v.len--;  // Trim spaces
     if (k.len == 0) return false;                          // empty name
-    // MG_INFO(("--HH [%.*s] [%.*s] [%.*s]", (int) tmp.len - 1, tmp.ptr,
+    // MG_INFO(("--HH [%.*s] [%.*s] [%.*s]", (int) tmp.len, tmp.ptr,
     //(int) k.len, k.ptr, (int) v.len, v.ptr));
     h[i].name = k;
     h[i].value = v;
@@ -1967,7 +1967,7 @@ static int uri_to_path2(struct mg_connection *c, struct mg_http_message *hm,
   }
   path[path_size - 1] = '\0';
   // Terminate root dir with /
-  if (n + 2 < path_size && path[n-1] != '/') path[n++] = '/', path[n] = '\0';
+  if (n + 2 < path_size && path[n - 1] != '/') path[n++] = '/', path[n] = '\0';
   mg_url_decode(hm->uri.ptr + url.len, hm->uri.len - url.len, path + n,
                 path_size - n, 0);
   path[path_size - 1] = '\0';  // Double-check
diff --git a/src/http.c b/src/http.c
index 20a94488..900fbbe1 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,7 +1,7 @@
-#include "http.h"
 #include "arch.h"
 #include "base64.h"
 #include "fmt.h"
+#include "http.h"
 #include "json.h"
 #include "log.h"
 #include "net.h"
@@ -207,11 +207,11 @@ static bool mg_http_parse_headers(const char *s, const char *end,
     const char *he = skip(s, end, "\r\n", &tmp);
     if (tmp.len == 0) break;  // empty header = EOH
     s = skip(s, he, ": \r\n", &k);
+    if (k.ptr[k.len] != ':') return false;  // Invalid header
     s = skip(s, he, "\r\n", &v);
-    if (k.len == tmp.len) continue;
     while (v.len > 0 && v.ptr[v.len - 1] == ' ') v.len--;  // Trim spaces
     if (k.len == 0) return false;                          // empty name
-    // MG_INFO(("--HH [%.*s] [%.*s] [%.*s]", (int) tmp.len - 1, tmp.ptr,
+    // MG_INFO(("--HH [%.*s] [%.*s] [%.*s]", (int) tmp.len, tmp.ptr,
     //(int) k.len, k.ptr, (int) v.len, v.ptr));
     h[i].name = k;
     h[i].value = v;
@@ -735,7 +735,7 @@ static int uri_to_path2(struct mg_connection *c, struct mg_http_message *hm,
   }
   path[path_size - 1] = '\0';
   // Terminate root dir with /
-  if (n + 2 < path_size && path[n-1] != '/') path[n++] = '/', path[n] = '\0';
+  if (n + 2 < path_size && path[n - 1] != '/') path[n++] = '/', path[n] = '\0';
   mg_url_decode(hm->uri.ptr + url.len, hm->uri.len - url.len, path + n,
                 path_size - n, 0);
   path[path_size - 1] = '\0';  // Double-check
diff --git a/test/unit_test.c b/test/unit_test.c
index 90577c48..718806de 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -845,6 +845,9 @@ static void test_http_server(void) {
   ASSERT(fetch(&mgr, buf, url, "GET /a.txt HTTP/1.0\n\n") == 200);
   ASSERT(cmpbody(buf, "hello\n") == 0);
 
+  // Invalid header: failure
+  ASSERT(fetch(&mgr, buf, url, "GET /a.txt HTTP/1.0\nA B\n\n") == 0);
+
   ASSERT(fetch(&mgr, buf, url, "GET /%%61.txt HTTP/1.0\n\n") == 200);
   ASSERT(cmpbody(buf, "hello\n") == 0);
 
@@ -1351,16 +1354,40 @@ static void test_http_parse(void) {
   }
 
   {
-    static const char *s = "get b c\nz :  k \nb: t\nvvv\n\n xx";
+    const char *s = "get b c\nb: t\nv:vv\n\n xx";
     ASSERT(mg_http_parse(s, strlen(s), &req) == (int) strlen(s) - 3);
-    ASSERT(req.headers[2].name.len == 0);
+  }
+
+  {
+    const char *s = "get b c\nb: t\nv:\n\n xx";
+    ASSERT(mg_http_parse(s, strlen(s), &req) == (int) strlen(s) - 3);
+  }
+
+  {
+    const char *s = "get b c\nb: t\nv v\n\n xx";
+    ASSERT(mg_http_parse(s, strlen(s), &req) == -1);
+  }
+
+  {
+    const char *s = "get b c\nb: t\n : aa\n\n";
+    ASSERT(mg_http_parse(s, strlen(s), &req) == -1);
+  }
+
+  {
+    const char *s = "get b c\nz:  k \nb: t\nv:k\n\n xx";
+    ASSERT(mg_http_parse(s, strlen(s), &req) == (int) strlen(s) - 3);
+    ASSERT(req.headers[3].name.len == 0);
+    ASSERT(mg_vcmp(&req.headers[0].name, "z") == 0);
     ASSERT(mg_vcmp(&req.headers[0].value, "k") == 0);
+    ASSERT(mg_vcmp(&req.headers[1].name, "b") == 0);
     ASSERT(mg_vcmp(&req.headers[1].value, "t") == 0);
+    ASSERT(mg_vcmp(&req.headers[2].name, "v") == 0);
+    ASSERT(mg_vcmp(&req.headers[2].value, "k") == 0);
     ASSERT(req.body.len == 0);
   }
 
   {
-    const char *s = "a b c\r\nContent-Length: 21 \r\nb: t\r\nvvv\r\n\r\nabc";
+    const char *s = "a b c\r\nContent-Length: 21 \r\nb: t\r\nv:v\r\n\r\nabc";
     ASSERT(mg_http_parse(s, strlen(s), &req) == (int) strlen(s) - 3);
     ASSERT(req.body.len == 21);
     ASSERT(req.message.len == 21 - 3 + strlen(s));
@@ -1452,9 +1479,9 @@ static void test_http_parse(void) {
     struct mg_http_message hm;
     const char *s = "a b c\n\n";
     ASSERT(mg_http_parse(s, strlen(s), &hm) == (int) strlen(s));
-    s = "a b\nc\n\n";
+    s = "a b\nc:d\n\n";
     ASSERT(mg_http_parse(s, strlen(s), &hm) == (int) strlen(s));
-    s = "a\nb\nc\n\n";
+    s = "a\nb:b\nc:c\n\n";
     ASSERT(mg_http_parse(s, strlen(s), &hm) < 0);
   }
 }
@@ -1922,7 +1949,7 @@ static void test_str(void) {
 
 static void fn1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_ERROR) {
-    ASSERT(* (void **) fn_data == NULL);
+    ASSERT(*(void **) fn_data == NULL);
     *(char **) fn_data = mg_mprintf("%s", (char *) ev_data);
   }
   (void) c;