aboutsummaryrefslogtreecommitdiff
path: root/weed/util/http_util.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/util/http_util.go')
-rw-r--r--weed/util/http_util.go21
1 files changed, 18 insertions, 3 deletions
diff --git a/weed/util/http_util.go b/weed/util/http_util.go
index 7ae5713bb..77a7a5fa3 100644
--- a/weed/util/http_util.go
+++ b/weed/util/http_util.go
@@ -2,6 +2,7 @@ package util
import (
"bytes"
+ "compress/gzip"
"encoding/json"
"errors"
"fmt"
@@ -184,24 +185,38 @@ func NormalizeUrl(url string) string {
return "http://" + url
}
-func ReadUrl(fileUrl string, offset int64, size int, buf []byte) (n int64, e error) {
+func ReadUrl(fileUrl string, offset int64, size int, buf []byte, isReadRange bool) (n int64, e error) {
req, _ := http.NewRequest("GET", fileUrl, nil)
- req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)))
+ if isReadRange {
+ req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+int64(size)))
+ } else {
+ req.Header.Set("Accept-Encoding", "gzip")
+ }
r, err := client.Do(req)
if err != nil {
return 0, err
}
+
defer r.Body.Close()
if r.StatusCode >= 400 {
return 0, fmt.Errorf("%s: %s", fileUrl, r.Status)
}
+ var reader io.ReadCloser
+ switch r.Header.Get("Content-Encoding") {
+ case "gzip":
+ reader, err = gzip.NewReader(r.Body)
+ defer reader.Close()
+ default:
+ reader = r.Body
+ }
+
var i, m int
for {
- m, err = r.Body.Read(buf[i:])
+ m, err = reader.Read(buf[i:])
if m == 0 {
return
}