From 784fabf2aed3a6aa88509c60ee90f60929fc0acf Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 30 Jul 2020 09:26:09 -0500 Subject: [PATCH] Issue #3916 - Fix whitespace between boundary and part headers + Updating existing testcase Signed-off-by: Joakim Erdfelt --- .../servlet/DefaultServletRangesTest.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java index 2d91621eb254..94708aabbec9 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java @@ -150,12 +150,28 @@ public void testMultipleRangeRequests() throws Exception String boundary = body.substring(0, body.indexOf("\r\n")); assertResponseContains("206 Partial", response); assertResponseContains("Content-Type: multipart/byteranges; boundary=", response); - assertResponseContains("Content-Range: bytes 0-9/80", response); - assertResponseContains("Content-Range: bytes 20-29/80", response); - assertResponseContains("Content-Range: bytes 40-49/80", response); - assertResponseContains(DATA.substring(0, 10), response); - assertResponseContains(DATA.substring(20, 30), response); - assertResponseContains(DATA.substring(40, 50), response); + + String section1 = boundary + "\r\n" + + "Content-Type: text/plain\r\n" + + "Content-Range: bytes 0-9/80\r\n" + + "\r\n" + + DATA.substring(0, 10) + "\r\n"; + assertResponseContains(section1, response); + + String section2 = boundary + "\r\n" + + "Content-Type: text/plain\r\n" + + "Content-Range: bytes 20-29/80\r\n" + + "\r\n" + + DATA.substring(20, 30) + "\r\n"; + assertResponseContains(section2, response); + + String section3 = boundary + "\r\n" + + "Content-Type: text/plain\r\n" + + "Content-Range: bytes 40-49/80\r\n" + + "\r\n" + + DATA.substring(40, 50) + "\r\n"; + assertResponseContains(section3, response); + assertTrue(body.endsWith(boundary + "--\r\n")); }