diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index be291e75..32911327 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3116,7 +3116,7 @@ parse_cookie_header (struct MHD_Connection *connection)
           hdr_len);
   cpy[hdr_len] = '\0';
 
-  strict_parsing = false; /* TODO: make it configurable */
+  strict_parsing = (1 == connection->daemon->strict_for_client);
   i = 0;
   /* Skip all initial whitespaces */
   while (i < hdr_len && (' ' == cpy[i] || '\t' == cpy[i]))