Browse Source
Merge pull request #2388 from kmlebedev/fix_mime
fix mine detect
pull/2395/head
Chris Lu
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
3 deletions
-
weed/s3api/s3api_object_handlers.go
|
|
|
@ -39,9 +39,12 @@ func init() { |
|
|
|
|
|
|
|
func mimeDetect(r *http.Request, dataReader io.Reader) io.ReadCloser { |
|
|
|
mimeBuffer := make([]byte, 512) |
|
|
|
dataReader.Read(mimeBuffer) |
|
|
|
r.Header.Set("Content-Type", http.DetectContentType(mimeBuffer)) |
|
|
|
return io.NopCloser(io.MultiReader(bytes.NewReader(mimeBuffer), dataReader)) |
|
|
|
size, _ := dataReader.Read(mimeBuffer) |
|
|
|
if size > 0 { |
|
|
|
r.Header.Set("Content-Type", http.DetectContentType(mimeBuffer)) |
|
|
|
return io.NopCloser(io.MultiReader(bytes.NewReader(mimeBuffer[:size]), dataReader)) |
|
|
|
} |
|
|
|
return io.NopCloser(dataReader) |
|
|
|
} |
|
|
|
|
|
|
|
func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
|
