diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-07-10 10:55:24 +0200 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-07-10 10:55:24 +0200 |
| commit | 602fd0ffdd5b6cfcf99363921960f02f1bd0d6ee (patch) | |
| tree | adb36d0e497903197940b205ab537fe1992e608a /api4 | |
| parent | 2df818b9c680d9e6aec2cddb4c910ecf8341e3a9 (diff) | |
| download | chat-602fd0ffdd5b6cfcf99363921960f02f1bd0d6ee.tar.gz chat-602fd0ffdd5b6cfcf99363921960f02f1bd0d6ee.tar.bz2 chat-602fd0ffdd5b6cfcf99363921960f02f1bd0d6ee.zip | |
MM-11189: Do not close the connection abruptly on too big emojis (#9071)
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/emoji.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api4/emoji.go b/api4/emoji.go index 42f66a22a..750f4b6e9 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -4,6 +4,8 @@ package api4 import ( + "io" + "io/ioutil" "net/http" "strings" @@ -28,6 +30,8 @@ func (api *API) InitEmoji() { } func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) { + defer io.Copy(ioutil.Discard, r.Body) + if !*c.App.Config().ServiceSettings.EnableCustomEmoji { c.Err = model.NewAppError("createEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) return |