Fixed multipart/form-data Content-Type detection

wlMalk · Oct 8, 2019 · f2d31d5 · f2d31d5
1 parent 5341c52
commit f2d31d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cache.go b/cache.go
@@ -504,7 +504,7 @@ func (c *cache) fieldAlias(field reflect.StructField, parentLocations []int, par
 
 	if alias == "" {
 		if tag, lTag := field.Tag.Get(nameTag), field.Tag.Get(fromTag); tag != "-" && lTag != "" {
-			locs := strings.Split(lTag, ",")
+			locs := clean(strings.Split(lTag, ","))
 			if len(locs) == 0 && len(parentLocations) > 0 {
 				locations = parentLocations
 			} else if len(locs) > 0 {
@@ -607,3 +607,10 @@ func underlyingElem(t reflect.Type) reflect.Type {
 	}
 	return t
 }
+
+func clean(s []string) []string {
+	for i := range s {
+		s[i] = strings.TrimSpace(s[i])
+	}
+	return s
+}
diff --git a/decoder.go b/decoder.go
@@ -150,7 +150,7 @@ func (d *Decoder) Decode(dst interface{}, r *http.Request) error {
 }
 
 func isMultipartForm(r *http.Request) bool {
-	return strings.HasPrefix(r.Header.Get("Content-Type"), "multipart/form-data;")
+	return strings.HasPrefix(r.Header.Get("Content-Type"), "multipart/form-data")
 }
 
 func isURLEncodedForm(r *http.Request) bool {