Issue jetty#3916 - Don't add blank lines after multipart boundaries

seanbright · Nov 1, 2019 · 4618811 · 4618811
1 parent 9cede68
commit 4618811
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartOutputStream.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartOutputStream.java
@@ -110,8 +110,10 @@ public void startPart(String contentType)
         out.write(boundaryBytes);
         out.write(__CRLF);
         if (contentType != null)
+        {
             out.write(("Content-Type: " + contentType).getBytes(StandardCharsets.ISO_8859_1));
-        out.write(__CRLF);
+            out.write(__CRLF);
+        }
         out.write(__CRLF);
     }
 
@@ -132,8 +134,10 @@ public void startPart(String contentType, String[] headers)
         out.write(boundaryBytes);
         out.write(__CRLF);
         if (contentType != null)
+        {
             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++)
         {
             out.write(headers[i].getBytes(StandardCharsets.ISO_8859_1));