Skip to content

Use '; ' as a separator between values of Cookie or Cookie2 request headers instead of ',' ... #4831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 2.x
Choose a base branch
from
Open

Use '; ' as a separator between values of Cookie or Cookie2 request headers instead of ',' ... #4831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c25f59
Use '; ' as a separator between values of Cookie or Cookie2 request h…
plevart Jul 27, 2021
dd29cc0
Fix checkstyle errors
plevart Jul 27, 2021
9d1c22f
Fix copyright in a header
plevart Jul 27, 2021
65fcdc0
Remove deprecated Cookie2 as a special-case header
plevart Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...nnector/src/main/java/org/glassfish/jersey/jdk/connector/internal/HttpRequestEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -36,10 +36,11 @@ class HttpRequestEncoder {

private static void appendUpgradeHeaders(StringBuilder request, Map<String, List<String>> headers) {
for (Map.Entry<String, List<String>> header : headers.entrySet()) {
String delimiter = "Cookie".equalsIgnoreCase(header.getKey()) ? "; " : ",";
StringBuilder value = new StringBuilder();
for (String valuePart : header.getValue()) {
if (value.length() != 0) {
value.append(",");
value.append(delimiter);
}
value.append(valuePart);
}
Expand Down
3 changes: 2 additions & 1 deletion core-client/src/main/java/org/glassfish/jersey/client/internal/HttpUrlConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ private void setOutboundHeaders(MultivaluedMap<String, String> headers, HttpURLC
boolean restrictedSent = false;
for (Map.Entry<String, List<String>> header : headers.entrySet()) {
String headerName = header.getKey();
String delimiter = "Cookie".equalsIgnoreCase(headerName) ? "; " : ",";
String headerValue;

List<String> headerValues = header.getValue();
Expand All @@ -436,7 +437,7 @@ private void setOutboundHeaders(MultivaluedMap<String, String> headers, HttpURLC
boolean add = false;
for (Object value : headerValues) {
if (add) {
b.append(',');
b.append(delimiter);
}
add = true;
b.append(value);
Expand Down