diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-10-19 15:01:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 15:01:45 -0400 |
| commit | cbb18479e9a4c410664535f6e0f5032d4261dfff (patch) | |
| tree | ab44fd631684298a719abd3240042375f00efc8f /api4/file.go | |
| parent | e60f97b4a84c207aadf51f7dbbc80e76c6f0476c (diff) | |
| download | chat-cbb18479e9a4c410664535f6e0f5032d4261dfff.tar.gz chat-cbb18479e9a4c410664535f6e0f5032d4261dfff.tar.bz2 chat-cbb18479e9a4c410664535f6e0f5032d4261dfff.zip | |
PLT-7740 Update encoding of filename in file headers (#7552)
* Remove URL escaping of filename in file headers
* Add encoding for filename
Diffstat (limited to 'api4/file.go')
| -rw-r--r-- | api4/file.go | 6 |
1 files 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 |