diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-06-23 09:12:02 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-06-23 09:12:02 -0700 |
| commit | fe60db404acc581dcadf400a9fb8a41cecb4bb09 (patch) | |
| tree | e20e9e8782512a552759580ba3dfdd2df857bac3 /weed/server | |
| parent | a4e3cffe0a452ad12b5aa9e3f57113a0fa4ba7ce (diff) | |
| download | seaweedfs-fe60db404acc581dcadf400a9fb8a41cecb4bb09.tar.xz seaweedfs-fe60db404acc581dcadf400a9fb8a41cecb4bb09.zip | |
prepare for zstd
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index aff1eab8d..7ef1170b3 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -142,21 +142,19 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) } } - if ext != ".gz" { + if ext != ".gz" && ext != ".zst" { if n.IsCompressed() { - if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") { - if _, _, _, shouldResize := shouldResizeImages(ext, r); shouldResize { - if n.Data, err = util.DecompressData(n.Data); err != nil { - glog.V(0).Infoln("ungzip error:", err, r.URL.Path) - } - } else { - if util.IsGzippedContent(n.Data) { - w.Header().Set("Content-Encoding", "gzip") - } + if _, _, _, shouldResize := shouldResizeImages(ext, r); shouldResize { + if n.Data, err = util.DecompressData(n.Data); err != nil { + glog.V(0).Infoln("ungzip error:", err, r.URL.Path) } + } else if strings.Contains(r.Header.Get("Accept-Encoding"), "zstd") && util.IsZstdContent(n.Data) { + w.Header().Set("Content-Encoding", "zstd") + } else if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") && util.IsGzippedContent(n.Data) { + w.Header().Set("Content-Encoding", "gzip") } else { if n.Data, err = util.DecompressData(n.Data); err != nil { - glog.V(0).Infoln("ungzip error:", err, r.URL.Path) + glog.V(0).Infoln("uncompress error:", err, r.URL.Path) } } } |