diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-01-22 22:59:12 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-01-22 22:59:12 -0800 |
| commit | 6a5c0370995653621fa8b576ea149e91875938d6 (patch) | |
| tree | 1fe9e691e5fb5ca5bf52c7a740872a6d74ef4560 | |
| parent | 72e1aff237511fff72e1455e1b31b1f55e6d0ceb (diff) | |
| download | seaweedfs-6a5c0370995653621fa8b576ea149e91875938d6.tar.xz seaweedfs-6a5c0370995653621fa8b576ea149e91875938d6.zip | |
fix http range requests
| -rw-r--r-- | other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java | 2 | ||||
| -rw-r--r-- | weed/util/http_util.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java index 2efa64580..b08c14467 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java @@ -63,7 +63,7 @@ public class SeaweedRead { if (!chunkView.isFullChunk) { request.setHeader(HttpHeaders.ACCEPT_ENCODING, ""); 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 { diff --git a/weed/util/http_util.go b/weed/util/http_util.go index 4aab90f5a..740d41967 100644 --- a/weed/util/http_util.go +++ b/weed/util/http_util.go @@ -196,7 +196,7 @@ func ReadUrl(fileUrl string, offset int64, size int, buf []byte, isReadRange boo return 0, err } 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 { 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 { 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) if err != nil { |