From 51ec226b335f0404fa665cc1cee59f1226f74442 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 8 Jul 2024 09:28:30 +1000 Subject: [PATCH 1/2] Ensure expired Set-Cookie not present on push as per spec --- .../java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java index c1239c220cee..b2ca1b4f0861 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java @@ -795,7 +795,8 @@ else if (o instanceof HttpCookie cookie && cookie.getName().equals(httpCookie.ge } continue; } - cookies.add(httpCookie); + else + cookies.add(httpCookie); } } From 6733959d892fffee27faec4fea797c5f6d95ad36 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 11 Jul 2024 07:57:41 +1000 Subject: [PATCH 2/2] Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java Co-authored-by: Greg Wilkins --- .../org/eclipse/jetty/ee11/servlet/ServletApiRequest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java index b2ca1b4f0861..c17e1831fbfa 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java @@ -796,7 +796,9 @@ else if (o instanceof HttpCookie cookie && cookie.getName().equals(httpCookie.ge continue; } else - cookies.add(httpCookie); + { + cookies.add(httpCookie); + } } }