From 8f7ce9adc044747c3a94d4e6fdb4319d1d6c8a9c Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Mon, 22 May 2017 10:27:48 +0200 Subject: [PATCH] mediaapi/writers/upload: Add note about Content-Disposition override --- src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go b/src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go index 92a80f2e2..debed48d3 100644 --- a/src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go +++ b/src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go @@ -123,6 +123,8 @@ func parseAndValidateRequest(req *http.Request, cfg *config.MediaAPI) (*uploadRe return nil, resErr } + // FIXME: do we want to always override ContentDisposition here or only if + // there is no Content-Disposition header set? if len(r.MediaMetadata.UploadName) > 0 { r.MediaMetadata.ContentDisposition = types.ContentDisposition( "inline; filename*=utf-8''" + url.PathEscape(string(r.MediaMetadata.UploadName)),