aboutsummaryrefslogtreecommitdiff
path: root/weed/server/common.go
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2017-01-08 10:30:40 -0800
committerGitHub <noreply@github.com>2017-01-08 10:30:40 -0800
commitb14332df96c5a51b5d21730d74b06ccb379b2657 (patch)
tree7ade8269a6d1aed75c73b7882371637b008dbc2f /weed/server/common.go
parent13e7069eb9cd72f94e72acb8fbbc9dd0307da703 (diff)
parentda9b672d1bce089c7a74e6b4bb68bb68cc4097f2 (diff)
downloadseaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.tar.xz
seaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.zip
Merge pull request #432 from sparklxb/master
support additional header name-value pairs
Diffstat (limited to 'weed/server/common.go')
-rw-r--r--weed/server/common.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/common.go b/weed/server/common.go
index dcd31f823..c5956143f 100644
--- a/weed/server/common.go
+++ b/weed/server/common.go
@@ -86,7 +86,7 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st
}
debug("parsing upload file...")
- fname, data, mimeType, isGzipped, lastModified, _, _, pe := storage.ParseUpload(r)
+ fname, data, mimeType, pairMap, isGzipped, lastModified, _, _, pe := storage.ParseUpload(r)
if pe != nil {
writeJsonError(w, r, http.StatusBadRequest, pe)
return
@@ -112,7 +112,7 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st
}
debug("upload file to store", url)
- uploadResult, err := operation.Upload(url, fname, bytes.NewReader(data), isGzipped, mimeType, jwt)
+ uploadResult, err := operation.Upload(url, fname, bytes.NewReader(data), isGzipped, mimeType, pairMap, jwt)
if err != nil {
writeJsonError(w, r, http.StatusInternalServerError, err)
return