diff --git a/src/headers.rs b/src/headers.rs
index 7fc486a80c..b726169fef 100644
--- a/src/headers.rs
+++ b/src/headers.rs
@@ -42,20 +42,14 @@ pub(super) fn content_length_parse_all_values(values: ValueIter<'_, HeaderValue>
     // be alright if they all contain the same value, and all parse
     // correctly. If not, then it's an error.
 
-    let folded = values.fold(None, |prev, line| match prev {
-        Some(Ok(prev)) => Some(
-            line.to_str()
-                .map_err(|_| ())
-                .and_then(|s| s.parse().map_err(|_| ()))
-                .and_then(|n| if prev == n { Ok(n) } else { Err(()) }),
-        ),
-        None => Some(
-            line.to_str()
-                .map_err(|_| ())
-                .and_then(|s| s.parse().map_err(|_| ())),
-        ),
-        Some(Err(())) => Some(Err(())),
-    });
+    let folded = values.flat_map(content_length_parse_line)
+        .fold(None, |prev, value| match prev {
+            Some(Ok(prev)) => Some(
+                value.and_then(|n| if prev == n { Ok(n) } else { Err(()) }),
+            ),
+            None => Some(value),
+            Some(Err(())) => Some(Err(())),
+        });
 
     if let Some(Ok(n)) = folded {
         Some(n)
@@ -64,6 +58,13 @@ pub(super) fn content_length_parse_all_values(values: ValueIter<'_, HeaderValue>
     }
 }
 
+fn content_length_parse_line(value: &HeaderValue) -> Vec<Result<u64, ()>> {
+    return match value.to_str() {
+        Ok(s) => s.split(',').map(|a| a.trim().parse().map_err(|_| ())).collect(),
+        Err(_) => vec![Err(())],
+    }
+}
+
 #[cfg(all(feature = "http2", feature = "client"))]
 pub(super) fn method_has_defined_payload_semantics(method: &Method) -> bool {
     match *method {
diff --git a/tests/client.rs b/tests/client.rs
index 479500ab3e..637689bee1 100644
--- a/tests/client.rs
+++ b/tests/client.rs
@@ -1043,6 +1043,29 @@ test! {
         error: |err| err.to_string() == "request has unsupported HTTP version",
 }
 
+test! {
+    name: client_handles_contentlength_values_on_same_line,
+
+    server:
+        expected: "GET /foo HTTP/1.1\r\nhost: {addr}\r\n\r\n",
+        reply: "\
+            HTTP/1.1 200 OK\r\n\
+            Content-Length: 3,3\r\n\
+            \r\n\
+            abc\r\n",
+
+    client:
+        request: {
+            method: GET,
+            url: "http://{addr}/foo",
+        },
+        response:
+            status: OK,
+            headers: {
+            },
+            body: &b"abc"[..],
+}
+
 mod dispatch_impl {
     use super::*;
     use std::io::{self, Read, Write};