diff options
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 4d04e71be..9ffb57bb4 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -1,7 +1,6 @@ package weed_server import ( - "bytes" "encoding/base64" "encoding/hex" "errors" @@ -17,11 +16,9 @@ import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/security" - "github.com/seaweedfs/seaweedfs/weed/util/mem" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" - "github.com/seaweedfs/seaweedfs/weed/images" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util" @@ -233,27 +230,6 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) return } - if rangeReq := r.Header.Get("Range"); rangeReq == "" { - ext := filepath.Ext(filename) - if len(ext) > 0 { - ext = strings.ToLower(ext) - } - width, height, mode, shouldResize := shouldResizeImages(ext, r) - if shouldResize { - data := mem.Allocate(int(totalSize)) - defer mem.Free(data) - err := filer.ReadAll(ctx, data, fs.filer.MasterClient, entry.GetChunks()) - if err != nil { - glog.ErrorfCtx(ctx, "failed to read %s: %v", path, err) - w.WriteHeader(http.StatusInternalServerError) - return - } - rs, _, _ := images.Resized(ext, bytes.NewReader(data), width, height, mode) - io.Copy(w, rs) - return - } - } - ProcessRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) { if offset+size <= int64(len(entry.Content)) { return func(writer io.Writer) error { |