diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-07-17 11:26:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 11:26:56 -0700 |
| commit | 8a1baafcb339a88d9587e25b1f61b0f84efe72e5 (patch) | |
| tree | d50c2c5653182a8f8e0967f4b2ce2664564de36e | |
| parent | f43146b237bc5bbfb7033f6e427b5299554c0824 (diff) | |
| parent | 4162766c46e5b3ece57de69de99754bf239eb44d (diff) | |
| download | seaweedfs-8a1baafcb339a88d9587e25b1f61b0f84efe72e5.tar.xz seaweedfs-8a1baafcb339a88d9587e25b1f61b0f84efe72e5.zip | |
Merge pull request #1392 from yourchanges/master
Fix the bug of "http://xx/xx,xxx.PNG?width=100"
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index 7ef1170b3..d508849bc 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -208,7 +208,9 @@ func (vs *VolumeServer) tryHandleChunkedFile(n *needle.Needle, fileName string, func conditionallyResizeImages(originalDataReaderSeeker io.ReadSeeker, ext string, r *http.Request) io.ReadSeeker { rs := originalDataReaderSeeker - + if len(ext) > 0 { + ext = strings.ToLower(ext) + } width, height, mode, shouldResize := shouldResizeImages(ext, r) if shouldResize { rs, _, _ = images.Resized(ext, originalDataReaderSeeker, width, height, mode) @@ -217,9 +219,6 @@ func conditionallyResizeImages(originalDataReaderSeeker io.ReadSeeker, ext strin } func shouldResizeImages(ext string, r *http.Request) (width, height int, mode string, shouldResize bool) { - if len(ext) > 0 { - ext = strings.ToLower(ext) - } if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" { if r.FormValue("width") != "" { width, _ = strconv.Atoi(r.FormValue("width")) |