Repository: tomee Updated Branches: refs/heads/master 3375c201e -> f78d33274
be closer to tomcat for header sending, dont concatenate them with a comma Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/831a2f76 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/831a2f76 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/831a2f76 Branch: refs/heads/master Commit: 831a2f76656bb7b8d97d30090f81807ab0ee633a Parents: 3375c20 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Wed Sep 7 15:42:20 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Wed Sep 7 15:42:20 2016 +0200 ---------------------------------------------------------------------- .../openejb/server/httpd/HttpResponseImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/831a2f76/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java ---------------------------------------------------------------------- diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java index c1a7af5..df96298 100644 --- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java +++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java @@ -525,22 +525,23 @@ public class HttpResponseImpl implements HttpResponse { */ private void writeHeaders(final DataOutput out) throws IOException { for (final Map.Entry<String, List<String>> entry : headers.entrySet()) { - out.writeBytes("" + entry.getKey()); - out.writeBytes(CSP); if (entry.getValue().size() == 1) { - out.writeBytes("" + entry.getValue().get(0)); + writeHeader(out, entry.getKey(), entry.getValue().get(0)); } else if (entry.getValue().size() > 1) { - final StringBuilder builder = new StringBuilder(); - for (final String e : entry.getValue()) { - builder.append(e).append(','); + for (final String val : entry.getValue()) { + writeHeader(out, entry.getKey(), val); } - builder.setLength(builder.length() - 1); - out.write(builder.toString().getBytes(encoding)); } - out.writeBytes(CRLF); } } + private void writeHeader(final DataOutput out, final String name, final String value) throws IOException { + out.writeBytes(name); + out.writeBytes(CSP); + out.writeBytes(value); + out.writeBytes(CRLF); + } + /** * writes the body out to the browser *
