Fix content-range header length

Submitted by Justin Chen.
apache · Nov 18, 2024 · 7d8ff31 · 7d8ff31
1 parent 05ddeea
commit 7d8ff31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2415,7 +2415,7 @@ protected void copy(WebResource resource, long length, ServletOutputStream ostre
                 }
                 long start = getStart(range, length);
                 long end = getEnd(range, length);
-                ostream.println("Content-Range: bytes " + start + "-" + end + "/" + (end - start));
+                ostream.println("Content-Range: bytes " + start + "-" + end + "/" + length);
                 ostream.println();
 
                 // Printing content

diff --git a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
@@ -75,6 +75,8 @@ public static Collection<Object[]> parameters() {
         // Valid range
         parameterSets.add(new Object[] {
                 "bytes=0-9", null, Integer.valueOf(206), "10", "0-9/" + len });
+        parameterSets.add(new Object[] {
+                "bytes=0-9,10-10", null, Integer.valueOf(206), null, "0-9/" + len });
         parameterSets.add(new Object[] {
                 "bytes=-100", null, Integer.valueOf(206), "100", (len - 100) + "-" + (len - 1) + "/" + len });
         parameterSets.add(new Object[] {
@@ -140,7 +142,7 @@ public void testRange() throws Exception {
         // Check the result
         Assert.assertEquals(responseCodeExpected, rc);
 
-        if (contentLengthExpected.length() > 0) {
+        if (contentLengthExpected != null && contentLengthExpected.length() > 0) {
             String contentLength = responseHeaders.get("Content-Length").get(0);
             Assert.assertEquals(contentLengthExpected, contentLength);
         }
@@ -151,7 +153,14 @@ public void testRange() throws Exception {
             if (headerValues != null && headerValues.size() == 1) {
                 responseRange = headerValues.get(0);
             }
-            Assert.assertEquals("bytes " + responseRangeExpected, responseRange);
+            if (responseRange != null) {
+                Assert.assertEquals("bytes " + responseRangeExpected, responseRange);
+            } else {
+                Assert.assertTrue(
+                        "Expected `Content-Range: " + "bytes " + responseRangeExpected +
+                                "` in multipart/byteranges response body not found!",
+                        responseBody.toString().contains("bytes " + responseRangeExpected));
+            }
         }
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -132,6 +132,10 @@
         The previous fix for incosistent resource metadata during concurrent
         reads and writes was incomplete. (markt)
       </fix>
+      <fix>
+        <pr>780</pr>: Fix <code>content-range</code> header length. Submitted
+        by Justin Chen. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">