Browse Source

avoid reparsing the multipart form

pull/719/head
Chris Lu 7 years ago
parent
commit
4d322df95e
  1. 4
      weed/storage/needle.go
  2. 7
      weed/storage/needle_parse_multipart.go

4
weed/storage/needle.go

@ -59,10 +59,8 @@ func ParseUpload(r *http.Request) (
}
}
isChunkedFile, _ = strconv.ParseBool(r.FormValue("cm"))
if r.Method == "POST" {
fileName, data, mimeType, isGzipped, e = parseMultipart(r, isChunkedFile)
fileName, data, mimeType, isGzipped, isChunkedFile, e = parseMultipart(r)
} else {
isGzipped = false
mimeType = r.Header.Get("Content-Type")

7
weed/storage/needle_parse_multipart.go

@ -8,10 +8,11 @@ import (
"net/http"
"path"
"strings"
"strconv"
)
func parseMultipart(r *http.Request, isChunkedFile bool) (
fileName string, data []byte, mimeType string, isGzipped bool, e error) {
func parseMultipart(r *http.Request) (
fileName string, data []byte, mimeType string, isGzipped, isChunkedFile bool, e error) {
form, fe := r.MultipartReader()
if fe != nil {
glog.V(0).Infoln("MultipartReader [ERROR]", fe)
@ -63,6 +64,8 @@ func parseMultipart(r *http.Request, isChunkedFile bool) (
}
}
isChunkedFile, _ = strconv.ParseBool(r.FormValue("cm"))
if !isChunkedFile {
dotIndex := strings.LastIndex(fileName, ".")

Loading…
Cancel
Save