diff options
| author | Chris Lu <chris.lu@gmail.com> | 2013-07-10 00:25:14 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2013-07-10 00:25:14 -0700 |
| commit | 4c200acd7dd663bed5f566c5538114ef66e5cbe3 (patch) | |
| tree | 7c186175c22a45d8346ce02ad6fb61766e2876c3 /go/operation | |
| parent | 53b6831f73ffcf4dcb6cbf6fdff0d7e60389745c (diff) | |
| download | seaweedfs-4c200acd7dd663bed5f566c5538114ef66e5cbe3.tar.xz seaweedfs-4c200acd7dd663bed5f566c5538114ef66e5cbe3.zip | |
1. ensure replicated file has the same timestamp
2. upload can specify modified time by &ts=...
3. correctly return code 304
Diffstat (limited to 'go/operation')
| -rw-r--r-- | go/operation/upload_content.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/go/operation/upload_content.go b/go/operation/upload_content.go index cae657b2c..27ebb0f5a 100644 --- a/go/operation/upload_content.go +++ b/go/operation/upload_content.go @@ -4,10 +4,12 @@ import ( "bytes" "encoding/json" "errors" + "path/filepath" _ "fmt" "io" "io/ioutil" "log" + "mime" "mime/multipart" "net/http" ) @@ -29,7 +31,8 @@ func Upload(uploadUrl string, filename string, reader io.Reader) (*UploadResult, log.Println("error copying data", err) return nil, err } - content_type := body_writer.FormDataContentType() + content_type := mime.TypeByExtension(filepath.Ext(filename)) + content_type := body_writer.FormDataContentType() if err = body_writer.Close(); err != nil { log.Println("error closing body", err) return nil, err |