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/server | |
| parent | 86a7c562751fc89d52da30425f1513b4553dfa8c (diff) | |
| download | seaweedfs-da9b672d1bce089c7a74e6b4bb68bb68cc4097f2.tar.xz seaweedfs-da9b672d1bce089c7a74e6b4bb68bb68cc4097f2.zip | |
support additional header name-value pairs
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/common.go | 4 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 3c9e3014f..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, pairs, 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, pairs, jwt) + uploadResult, err := operation.Upload(url, fname, bytes.NewReader(data), isGzipped, mimeType, pairMap, jwt) if err != nil { writeJsonError(w, r, http.StatusInternalServerError, err) return diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index aed393dcd..80f222ce6 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -13,10 +13,9 @@ import ( "net/http" "net/textproto" "net/url" - "strings" - "path" "strconv" + "strings" "github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/glog" |