diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2017-01-08 10:30:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 10:30:40 -0800 |
| commit | b14332df96c5a51b5d21730d74b06ccb379b2657 (patch) | |
| tree | 7ade8269a6d1aed75c73b7882371637b008dbc2f /weed/operation/submit.go | |
| parent | 13e7069eb9cd72f94e72acb8fbbc9dd0307da703 (diff) | |
| parent | da9b672d1bce089c7a74e6b4bb68bb68cc4097f2 (diff) | |
| download | seaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.tar.xz seaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.zip | |
Merge pull request #432 from sparklxb/master
support additional header name-value pairs
Diffstat (limited to 'weed/operation/submit.go')
| -rw-r--r-- | weed/operation/submit.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/operation/submit.go b/weed/operation/submit.go index 1de6b544a..75d5afbde 100644 --- a/weed/operation/submit.go +++ b/weed/operation/submit.go @@ -155,7 +155,7 @@ func (fi FilePart) Upload(maxMB int, master string, secret security.Secret) (ret cm.DeleteChunks(master) } } else { - ret, e := Upload(fileUrl, baseName, fi.Reader, fi.IsGzipped, fi.MimeType, jwt) + ret, e := Upload(fileUrl, baseName, fi.Reader, fi.IsGzipped, fi.MimeType, nil, jwt) if e != nil { return 0, e } @@ -180,7 +180,7 @@ func upload_one_chunk(filename string, reader io.Reader, master, fileUrl, fid := "http://"+ret.Url+"/"+ret.Fid, ret.Fid glog.V(4).Info("Uploading part ", filename, " to ", fileUrl, "...") uploadResult, uploadError := Upload(fileUrl, filename, reader, false, - "application/octet-stream", jwt) + "application/octet-stream", nil, jwt) if uploadError != nil { return fid, 0, uploadError } @@ -198,6 +198,6 @@ func upload_chunked_file_manifest(fileUrl string, manifest *ChunkManifest, jwt s q := u.Query() q.Set("cm", "true") u.RawQuery = q.Encode() - _, e = Upload(u.String(), manifest.Name, bufReader, false, "application/json", jwt) + _, e = Upload(u.String(), manifest.Name, bufReader, false, "application/json", nil, jwt) return e } |