Browse Source

fix http range requests

pull/1189/head
Chris Lu 5 years ago
parent
commit
6a5c037099
  1. 2
      other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
  2. 4
      weed/util/http_util.go

2
other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java

@ -63,7 +63,7 @@ public class SeaweedRead {
if (!chunkView.isFullChunk) { if (!chunkView.isFullChunk) {
request.setHeader(HttpHeaders.ACCEPT_ENCODING, ""); request.setHeader(HttpHeaders.ACCEPT_ENCODING, "");
request.setHeader(HttpHeaders.RANGE, request.setHeader(HttpHeaders.RANGE,
String.format("bytes=%d-%d", chunkView.offset, chunkView.offset + chunkView.size));
String.format("bytes=%d-%d", chunkView.offset, chunkView.offset + chunkView.size - 1));
} }
try { try {

4
weed/util/http_util.go

@ -196,7 +196,7 @@ func ReadUrl(fileUrl string, offset int64, size int, buf []byte, isReadRange boo
return 0, err return 0, err
} }
if isReadRange { if isReadRange {
req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)))
req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)-1))
} else { } else {
req.Header.Set("Accept-Encoding", "gzip") req.Header.Set("Accept-Encoding", "gzip")
} }
@ -256,7 +256,7 @@ func ReadUrlAsStream(fileUrl string, offset int64, size int, fn func(data []byte
if err != nil { if err != nil {
return 0, err return 0, err
} }
req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)))
req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)-1))
r, err := client.Do(req) r, err := client.Do(req)
if err != nil { if err != nil {

Loading…
Cancel
Save