From 688ceb848941f41fc85c17264a5d60b2f2fbeeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E8=B6=85?= Date: Fri, 13 Jan 2017 10:51:41 +0800 Subject: [PATCH] fix --- weed/server/filer_server_handlers_read.go | 2 +- weed/server/volume_server_handlers_read.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 99859f685..fe9aa4586 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -110,7 +110,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, } jwt := security.GetJwt(r) - _, err = operation.Upload("http://"+r.Host+r.URL.Path, fileName, bytes.NewReader(data), false, contentType, jwt) + _, err = operation.Upload("http://"+r.Host+r.URL.Path, fileName, bytes.NewReader(data), false, contentType, nil, jwt) if err != nil { glog.V(0).Infoln(err) return diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index 47e65b8ab..f021aba7f 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -16,8 +16,6 @@ import ( "strings" "time" - "encoding/json" - "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/images" "github.com/chrislusf/seaweedfs/weed/operation" @@ -168,7 +166,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) reqUrl := r.Header.Get("path") + "?w=" + r.FormValue("w") + "&h=" + r.FormValue("h") + "&r=" + r.FormValue("r") jwt := security.GetJwt(r) - _, err = operation.Upload("http://"+r.Host+reqUrl, filename, bytes.NewReader(n.Data), false, "image/jpeg", jwt) + _, err = operation.Upload("http://"+r.Host+reqUrl, filename, bytes.NewReader(n.Data), false, "image/jpeg", nil, jwt) if err != nil { glog.V(0).Infoln(err) }