Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3916 - Fix whitespace between boundary and part headers 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-07-30 09:13:01 -05:00
parent f37f82828f
commit 36b42ca65d
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartOutputStream.java
View File

@ -29,8 +29,8 @@ import java.nio.charset.StandardCharsets;
public class MultiPartOutputStream extends FilterOutputStream public class MultiPartOutputStream extends FilterOutputStream
{ {
private static final byte[] __CRLF = {'\r', '\n'}; private static final byte[] CRLF = {'\r', '\n'};
private static final byte[] __DASHDASH = {'-', '-'}; private static final byte[] DASHDASH = {'-', '-'};
public static final String MULTIPART_MIXED = "multipart/mixed"; public static final String MULTIPART_MIXED = "multipart/mixed";
public static final String MULTIPART_X_MIXED_REPLACE = "multipart/x-mixed-replace"; public static final String MULTIPART_X_MIXED_REPLACE = "multipart/x-mixed-replace";
@ -71,11 +71,11 @@ public class MultiPartOutputStream extends FilterOutputStream
try try
{ {
if (inPart) if (inPart)
out.write(__CRLF); out.write(CRLF);
out.write(__DASHDASH); out.write(DASHDASH);
out.write(boundaryBytes); out.write(boundaryBytes);
out.write(__DASHDASH); out.write(DASHDASH);
out.write(__CRLF); out.write(CRLF);
inPart = false; inPart = false;
} }
finally finally
@ -104,15 +104,19 @@ public class MultiPartOutputStream extends FilterOutputStream
throws IOException throws IOException
{ {
if (inPart) if (inPart)
out.write(__CRLF); {
out.write(CRLF);
}
inPart = true; inPart = true;
out.write(__DASHDASH); out.write(DASHDASH);
out.write(boundaryBytes); out.write(boundaryBytes);
out.write(__CRLF); out.write(CRLF);
if (contentType != null) if (contentType != null)
{
out.write(("Content-Type: " + contentType).getBytes(StandardCharsets.ISO_8859_1)); out.write(("Content-Type: " + contentType).getBytes(StandardCharsets.ISO_8859_1));
out.write(__CRLF); out.write(CRLF);
out.write(__CRLF); }
out.write(CRLF);
} }
/** /**
@ -126,20 +130,22 @@ public class MultiPartOutputStream extends FilterOutputStream
throws IOException throws IOException
{ {
if (inPart) if (inPart)
out.write(__CRLF); out.write(CRLF);
inPart = true; inPart = true;
out.write(__DASHDASH); out.write(DASHDASH);
out.write(boundaryBytes); out.write(boundaryBytes);
out.write(__CRLF); out.write(CRLF);
if (contentType != null) if (contentType != null)
{
out.write(("Content-Type: " + contentType).getBytes(StandardCharsets.ISO_8859_1)); out.write(("Content-Type: " + contentType).getBytes(StandardCharsets.ISO_8859_1));
out.write(__CRLF); out.write(CRLF);
}
for (int i = 0; headers != null && i < headers.length; i++) for (int i = 0; headers != null && i < headers.length; i++)
{ {
out.write(headers[i].getBytes(StandardCharsets.ISO_8859_1)); out.write(headers[i].getBytes(StandardCharsets.ISO_8859_1));
out.write(__CRLF); out.write(CRLF);
} }
out.write(__CRLF); out.write(CRLF);
} }
@Override @Override
@ -148,7 +154,3 @@ public class MultiPartOutputStream extends FilterOutputStream
out.write(b, off, len); out.write(b, off, len);
} }
} }