Merge pull request #1213 from awoods/fcrepo-2536-4.7-maint

Using range length for content-length header
fcrepo · Aug 31, 2017 · e279185 · e279185
2 parents 2ec5d46 + 5447dca
commit e279185
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java
@@ -348,7 +348,8 @@ protected Response getBinaryContent(final String rangeValue)
                             new RangeRequestInputStream(binary.getContent(), range.start(), range.size());
 
                     builder = status(PARTIAL_CONTENT).entity(rangeInputStream)
-                            .header("Content-Range", contentRangeValue);
+                            .header("Content-Range", contentRangeValue)
+                            .header(CONTENT_LENGTH, range.size());
                 }
 
             } else {

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java
@@ -40,6 +40,7 @@
 import static javax.ws.rs.core.Response.Status.NOT_MODIFIED;
 import static javax.ws.rs.core.Response.Status.NO_CONTENT;
 import static javax.ws.rs.core.Response.Status.OK;
+import static javax.ws.rs.core.Response.Status.PARTIAL_CONTENT;
 import static javax.ws.rs.core.Response.Status.PRECONDITION_FAILED;
 import static javax.ws.rs.core.Response.Status.TEMPORARY_REDIRECT;
 import static javax.ws.rs.core.Response.Status.UNSUPPORTED_MEDIA_TYPE;
@@ -1503,6 +1504,24 @@ public void testGetDatastream() throws IOException, ParseException {
         }
     }
 
+    @Test
+    public void testGetLongRange() throws IOException, ParseException {
+        final String id = getRandomUniqueId();
+        createObjectAndClose(id);
+        final StringBuffer buf = new StringBuffer();
+        while ( buf.length() < 9000 ) {
+            buf.append("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+        }
+        createDatastream(id, "ds1", buf.toString());
+
+        final HttpGet get = getDSMethod(id, "ds1");
+        get.setHeader("Range", "bytes=0-8199");
+        try (final CloseableHttpResponse response = execute(get)) {
+            assertEquals("Expected 206 Partial Content!", PARTIAL_CONTENT.getStatusCode(), getStatus(response));
+            assertEquals("Expected range length (8200)!", "8200", response.getFirstHeader(CONTENT_LENGTH).getValue());
+        }
+    }
+
     @Test
     public void testDeleteDatastream() throws IOException {
         final String id = getRandomUniqueId();

diff --git a/...-commons/src/test/java/org/fcrepo/http/commons/responses/RangeRequestInputStreamTest.java b/...-commons/src/test/java/org/fcrepo/http/commons/responses/RangeRequestInputStreamTest.java
@@ -51,4 +51,16 @@ public void shouldAcceptUnboundedRanges() throws IOException {
             assertEquals("0123456789", s);
         }
     }
+
+    @Test
+    public void getGetLongRange() throws IOException {
+        final StringBuffer buf = new StringBuffer();
+        while ( buf.length() < 9000 ) {
+            buf.append("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+        }
+        final InputStream in = new ByteArrayInputStream(buf.toString().getBytes());
+        try (final RangeRequestInputStream out = new RangeRequestInputStream(in, 0L, 9000)) {
+            assertEquals(9000, IOUtils.toString(out, UTF_8).length());
+        }
+    }
 }