Merge pull request #166 from quarkusio/quarkus-#43628

Properly remove cookie header
quarkusio · Oct 1, 2024 · cdf13a0 · cdf13a0
2 parents 13598b3 + f6e79a3
commit cdf13a0
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/PushBuilderImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/PushBuilderImpl.java
@@ -112,15 +112,14 @@ public PushBuilderImpl(HttpServletRequestImpl servletRequest) {
             if(cookie.getValue().getMaxAge() != null && cookie.getValue().getMaxAge() <= 0) {
                 //remove cookie
                 List<String> existing = this.headers.getAll(HttpHeaderNames.COOKIE);
-                if(existing != null) {
-                    Iterator<String> it = existing.iterator();
-                    while (it.hasNext()) {
-                        String val = it.next();
-                        if(val.startsWith(cookie.getKey() + "=")) {
-                            it.remove();
-                        }
+                List<String> newValues = new ArrayList<>(existing.size());
+                for (String value : existing) {
+                    if(value.startsWith(cookie.getKey() + "=")) {
+                        continue;
                     }
+                    newValues.add(value);
                 }
+                this.headers.set(HttpHeaderNames.COOKIE, newValues);
             } else if(!cookie.getKey().equals(servletRequest.getServletContext().getSessionCookieConfig().getName())){
                 this.headers.add(HttpHeaderNames.COOKIE, cookie.getKey() + "=" + cookie.getValue().getValue());
             }