diff options
-rw-r--r-- | api/file.go | 6 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/api/file.go b/api/file.go index 8afc70692..4339e610b 100644 --- a/api/file.go +++ b/api/file.go @@ -76,6 +76,12 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) { return } + if r.ContentLength > model.MAX_FILE_SIZE { + c.Err = model.NewAppError("uploadFile", "Unable to upload file. File is too large.", "") + c.Err.StatusCode = http.StatusRequestEntityTooLarge + return + } + err := r.ParseMultipartForm(model.MAX_FILE_SIZE) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index c47f7d33d..014038dd4 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -162,7 +162,6 @@ export default class UserSettingsGeneralTab extends React.Component { return; } - var formData = new FormData(); formData.append('image', picture, picture.name); this.setState({loadingPicture: true}); |