🐛 fix Content-Range header for partial response according to http spec (

http://bit.ly/content-range)
danikula · Oct 23, 2015 · 14ac4a9 · 14ac4a9
1 parent c5cf254
commit 14ac4a9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -26,7 +26,7 @@ publish {
     userOrg = 'alexeydanilov'
     groupId = 'com.danikula'
     artifactId = 'videocache'
-    publishVersion = '2.3.0'
+    publishVersion = '2.3.1'
     description = 'Cache support for android VideoView'
     website = 'https://github.com/danikula/AndroidVideoCache'
 }
diff --git a/library/src/main/java/com/danikula/videocache/HttpProxyCache.java b/library/src/main/java/com/danikula/videocache/HttpProxyCache.java
@@ -66,7 +66,7 @@ private String newResponseHeaders(GetRequest request) throws IOException, ProxyC
                 .append(request.partial ? "HTTP/1.1 206 PARTIAL CONTENT\n" : "HTTP/1.1 200 OK\n")
                 .append("Accept-Ranges: bytes\n")
                 .append(lengthKnown ? String.format("Content-Length: %d\n", contentLength) : "")
-                .append(addRange ? String.format("Content-Range: bytes %d-%d/%d\n", request.rangeOffset, length, length) : "")
+                .append(addRange ? String.format("Content-Range: bytes %d-%d/%d\n", request.rangeOffset, length - 1, length) : "")
                 .append(mimeKnown ? String.format("Content-Type: %s\n", mime) : "")
                 .append("\n") // headers end
                 .toString();

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -35,10 +35,10 @@ apt {
 }
 
 dependencies {
-    compile project(':library')
+//    compile project(':library')
     compile 'com.android.support:support-v4:23.1.0'
     compile 'org.androidannotations:androidannotations-api:3.3.2'
-//    compile 'com.danikula:videocache:2.2.0'
+    compile 'com.danikula:videocache:2.3.1'
     compile 'com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar'
     apt 'org.androidannotations:androidannotations:3.3.2'
 }
diff --git a/test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java b/test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java
@@ -125,7 +125,7 @@ public void testProxyPartialResponse() throws Exception {
         assertThat(response.second.headers.containsKey("Accept-Ranges")).isTrue();
         assertThat(response.second.headers.get("Accept-Ranges").get(0)).isEqualTo("bytes");
         assertThat(response.second.headers.containsKey("Content-Range")).isTrue();
-        String rangeHeader = String.format("bytes %d-%d/%d", offset, HTTP_DATA_BIG_SIZE, HTTP_DATA_BIG_SIZE);
+        String rangeHeader = String.format("bytes %d-%d/%d", offset, HTTP_DATA_BIG_SIZE - 1, HTTP_DATA_BIG_SIZE);
         assertThat(response.second.headers.get("Content-Range").get(0)).isEqualTo(rangeHeader);
         byte[] expectedData = Arrays.copyOfRange(loadAssetFile(ASSETS_DATA_BIG_NAME), offset, HTTP_DATA_BIG_SIZE);
         assertThat(response.second.data).isEqualTo(expectedData);
@@ -143,7 +143,7 @@ public void testProxyPartialResponseWithRedirect() throws Exception {
         assertThat(response.second.headers.containsKey("Accept-Ranges")).isTrue();
         assertThat(response.second.headers.get("Accept-Ranges").get(0)).isEqualTo("bytes");
         assertThat(response.second.headers.containsKey("Content-Range")).isTrue();
-        String rangeHeader = String.format("bytes %d-%d/%d", offset, HTTP_DATA_BIG_SIZE, HTTP_DATA_BIG_SIZE);
+        String rangeHeader = String.format("bytes %d-%d/%d", offset, HTTP_DATA_BIG_SIZE - 1, HTTP_DATA_BIG_SIZE);
         assertThat(response.second.headers.get("Content-Range").get(0)).isEqualTo(rangeHeader);
         byte[] expectedData = Arrays.copyOfRange(loadAssetFile(ASSETS_DATA_BIG_NAME), offset, HTTP_DATA_BIG_SIZE);
         assertThat(response.second.data).isEqualTo(expectedData);