diff --git a/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala b/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala index aa0d5ea1ad..d3268012eb 100644 --- a/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala +++ b/akka-http-core/src/main/scala/akka/http/model/parser/SimpleHeaders.scala @@ -93,7 +93,7 @@ private[parser] trait SimpleHeaders { this: Parser with CommonRules with CommonA // https://tools.ietf.org/html/rfc6265#section-4.2 def `cookie` = rule { - oneOrMore(`cookie-pair`).separatedBy(ws(';')) ~ EOI ~> (`Cookie`(_)) + oneOrMore(`cookie-pair`).separatedBy((ch(';') | ch(',')) ~ OWS) ~ EOI ~> (`Cookie`(_)) } // http://tools.ietf.org/html/rfc7231#section-7.1.1.2 diff --git a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala b/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala index 3dd2f55de5..03a05930d7 100644 --- a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala @@ -212,6 +212,7 @@ class HttpHeaderSpec extends FreeSpec with Matchers { "Cookie: a=1;b=2" =!= Cookie(HttpCookie("a", "1"), HttpCookie("b", "2")).renderedTo("a=1; b=2") "Cookie: a=1 ;b=2" =!= Cookie(HttpCookie("a", "1"), HttpCookie("b", "2")).renderedTo("a=1; b=2") "Cookie: a=1; b=2" =!= Cookie(HttpCookie("a", "1"), HttpCookie("b", "2")) + "Cookie: a=1,b=2" =!= Cookie(HttpCookie("a", "1"), HttpCookie("b", "2")).renderedTo("a=1; b=2") Cookie(HttpCookie("SID", "31d4d96e407aad42", domain = Some("example.com"), expires = Some(DateTime(2021, 6, 9, 10, 18, 14)),