From cbb18479e9a4c410664535f6e0f5032d4261dfff Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 19 Oct 2017 15:01:45 -0400 Subject: PLT-7740 Update encoding of filename in file headers (#7552) * Remove URL escaping of filename in file headers * Add encoding for filename --- api4/file.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api4/file.go b/api4/file.go index 933640c44..a8297df04 100644 --- a/api4/file.go +++ b/api4/file.go @@ -337,10 +337,12 @@ func writeFileResponse(filename string, contentType string, bytes []byte, forceD toDownload = !isMediaType } + filename = url.PathEscape(filename) + if toDownload { - w.Header().Set("Content-Disposition", "attachment;filename=\""+filename+"\"; filename*=UTF-8''"+url.QueryEscape(filename)) + w.Header().Set("Content-Disposition", "attachment;filename=\""+filename+"\"; filename*=UTF-8''"+filename) } else { - w.Header().Set("Content-Disposition", "inline;filename=\""+filename+"\"; filename*=UTF-8''"+url.QueryEscape(filename)) + w.Header().Set("Content-Disposition", "inline;filename=\""+filename+"\"; filename*=UTF-8''"+filename) } // prevent file links from being embedded in iframes -- cgit v1.2.3-1-g7c22