diff options
| author | sparklxb <sparklxb@163.com> | 2017-01-08 22:34:26 +0800 |
|---|---|---|
| committer | sparklxb <sparklxb@163.com> | 2017-01-08 22:34:42 +0800 |
| commit | da9b672d1bce089c7a74e6b4bb68bb68cc4097f2 (patch) | |
| tree | 7ade8269a6d1aed75c73b7882371637b008dbc2f /weed/operation | |
| parent | 86a7c562751fc89d52da30425f1513b4553dfa8c (diff) | |
| download | seaweedfs-da9b672d1bce089c7a74e6b4bb68bb68cc4097f2.tar.xz seaweedfs-da9b672d1bce089c7a74e6b4bb68bb68cc4097f2.zip | |
support additional header name-value pairs
Diffstat (limited to 'weed/operation')
| -rw-r--r-- | weed/operation/upload_content.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/weed/operation/upload_content.go b/weed/operation/upload_content.go index b5784322a..30c7f1ea3 100644 --- a/weed/operation/upload_content.go +++ b/weed/operation/upload_content.go @@ -36,13 +36,13 @@ func init() { var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"") -func Upload(uploadUrl string, filename string, reader io.Reader, isGzipped bool, mtype string, pairs []byte, jwt security.EncodedJwt) (*UploadResult, error) { +func Upload(uploadUrl string, filename string, reader io.Reader, isGzipped bool, mtype string, pairMap map[string]string, jwt security.EncodedJwt) (*UploadResult, error) { return upload_content(uploadUrl, func(w io.Writer) (err error) { _, err = io.Copy(w, reader) return - }, filename, isGzipped, mtype, pairs, jwt) + }, filename, isGzipped, mtype, pairMap, jwt) } -func upload_content(uploadUrl string, fillBufferFunction func(w io.Writer) error, filename string, isGzipped bool, mtype string, pairs []byte, jwt security.EncodedJwt) (*UploadResult, error) { +func upload_content(uploadUrl string, fillBufferFunction func(w io.Writer) error, filename string, isGzipped bool, mtype string, pairMap map[string]string, jwt security.EncodedJwt) (*UploadResult, error) { body_buf := bytes.NewBufferString("") body_writer := multipart.NewWriter(body_buf) h := make(textproto.MIMEHeader) @@ -59,13 +59,6 @@ func upload_content(uploadUrl string, fillBufferFunction func(w io.Writer) error if jwt != "" { h.Set("Authorization", "BEARER "+string(jwt)) } - pairMap := make(map[string]string) - if len(pairs) != 0 { - err := json.Unmarshal(pairs, &pairMap) - if err != nil { - glog.V(0).Infoln("Unmarshal pairs error:", err) - } - } file_writer, cp_err := body_writer.CreatePart(h) if cp_err != nil { |