Merge pull request #73 from http-rs/append-headr

Append headers on client response instead of overwriting them

Author: rylev

src/client.rs

@@ -174,7 +174,7 @@ where
     for header in httparse_res.headers.iter() {
         let name = HeaderName::from_str(header.name)?;
         let value = HeaderValue::from_str(std::str::from_utf8(header.value)?)?;
-        res.insert_header(name, value)?;
+        res.append_header(name, value)?;
     }
 
     if res.header(&DATE).is_none() {

tests/client.rs

@@ -1,8 +1,6 @@
 use crate::common::fixture_path;
 use async_h1::client;
 use async_std::fs::File;
-use async_std::io::SeekFrom;
-use async_std::prelude::*;
 use http_types::{headers, Method, Request, StatusCode};
 use url::Url;
 
@@ -12,7 +10,11 @@ use common::TestCase;
 
 #[async_std::test]
 async fn test_encode_request_add_date() {
-    let case = TestCase::new_client("fixtures/request1.txt", "fixtures/response1.txt").await;
+    let case = TestCase::new_client(
+        "fixtures/request-add-date.txt",
+        "fixtures/response-add-date.txt",
+    )
+    .await;
 
     let url = Url::parse("http://localhost:8080").unwrap();
     let mut req = Request::new(Method::Post, url);
@@ -26,12 +28,22 @@ async fn test_encode_request_add_date() {
 
 #[async_std::test]
 async fn test_response_no_date() {
-    let mut response_fixture = File::open(fixture_path("fixtures/response-no-date.txt"))
+    let response_fixture = File::open(fixture_path("fixtures/response-no-date.txt"))
         .await
         .unwrap();
-    response_fixture.seek(SeekFrom::Start(0)).await.unwrap();
 
     let res = client::decode(response_fixture).await.unwrap();
 
     pretty_assertions::assert_eq!(res.header(&headers::DATE).is_some(), true);
 }
+
+#[async_std::test]
+async fn test_multiple_header_values_for_same_header_name() {
+    let response_fixture = File::open(fixture_path("fixtures/response-multiple-cookies.txt"))
+        .await
+        .unwrap();
+
+    let res = client::decode(response_fixture).await.unwrap();
+
+    pretty_assertions::assert_eq!(res.header(&headers::SET_COOKIE).unwrap().len(), 2);
+}

tests/fixtures/request1.txt renamed to tests/fixtures/request-add-date.txt

@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+host: example.com
+content-length: 0
+set-cookie: sessionId=e8bb43229de9
+set-cookie: qwerty=219ffwef9w0f
+

tests/fixtures/response1.txt renamed to tests/fixtures/response-add-date.txt

@@ -7,7 +7,11 @@ mod common;
 
 #[async_std::test]
 async fn test_basic_request() {
-    let case = TestCase::new_server("fixtures/request1.txt", "fixtures/response1.txt").await;
+    let case = TestCase::new_server(
+        "fixtures/request-add-date.txt",
+        "fixtures/response-add-date.txt",
+    )
+    .await;
     let addr = "http://example.com";
 
     async_h1::accept(addr, case.clone(), |_req| async {