Merge 04e75f471290907655a2e1c97005d9553241995b into 626d55b0c02937645c21774cacc021713de88604

This commit is contained in:
Calvin Liu 2024-06-27 07:28:12 +08:00 committed by GitHub
commit 848d4a26c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions

View File

@ -609,8 +609,12 @@ func (c *Context) FormFile(name string) (*multipart.FileHeader, error) {
// MultipartForm is the parsed multipart form, including file uploads. // MultipartForm is the parsed multipart form, including file uploads.
func (c *Context) MultipartForm() (*multipart.Form, error) { func (c *Context) MultipartForm() (*multipart.Form, error) {
err := c.Request.ParseMultipartForm(c.engine.MaxMultipartMemory) if c.Request.MultipartForm == nil {
return c.Request.MultipartForm, err if err := c.Request.ParseMultipartForm(c.engine.MaxMultipartMemory); err != nil {
return nil, err
}
}
return c.Request.MultipartForm, nil
} }
// SaveUploadedFile uploads the form file to specific dst. // SaveUploadedFile uploads the form file to specific dst.

View File

@ -120,7 +120,7 @@ func TestContextMultipartForm(t *testing.T) {
if assert.NoError(t, err) { if assert.NoError(t, err) {
assert.NotNil(t, f) assert.NotNil(t, f)
} }
assert.Equal(t, c.PostForm("foo"), "bar")
assert.NoError(t, c.SaveUploadedFile(f.File["file"][0], "test")) assert.NoError(t, c.SaveUploadedFile(f.File["file"][0], "test"))
} }