qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-14 15:00:27 -07:00
Code Releases Activity

fix the logic for checking multipart/mixed and add a test

Browse Source
This commit is contained in:
OneOfOne 2018-02-21 21:58:17 +02:00
parent 885ff1d9c9
commit 08ce026f52
No known key found for this signature in database
GPG Key ID: F3A4E8B6760B7805
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/http/request.go
View File

@ -431,7 +431,7 @@ func (r *Request) multipartReader(allowMixed bool) (*multipart.Reader, error) {
return nil, ErrNotMultipart return nil, ErrNotMultipart
} }
d, params, err := mime.ParseMediaType(v) d, params, err := mime.ParseMediaType(v)
if err != nil || d != "multipart/form-data" || (allowMixed && d != "multipart/mixed") { if err != nil || !(d == "multipart/form-data" || allowMixed && d == "multipart/mixed") {
return nil, ErrNotMultipart return nil, ErrNotMultipart
} }
boundary, ok := params["boundary"] boundary, ok := params["boundary"]

10
src/net/http/request_test.go
View File

@ -143,6 +143,16 @@ func TestMultipartReader(t *testing.T) {
t.Errorf("expected multipart; error: %v", err) t.Errorf("expected multipart; error: %v", err)
} }
req = &Request{
Method: "POST",
Header: Header{"Content-Type": {`multipart/mixed; boundary="foo123"`}},
Body: ioutil.NopCloser(new(bytes.Buffer)),
}
multipart, err = req.MultipartReader()
if multipart == nil {
t.Errorf("expected multipart; error: %v", err)
}
req.Header = Header{"Content-Type": {"text/plain"}} req.Header = Header{"Content-Type": {"text/plain"}}
multipart, err = req.MultipartReader() multipart, err = req.MultipartReader()
if multipart != nil { if multipart != nil {