haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-03 16:34:33 +00:00
Code Issues Releases Wiki Activity

Fix incorrect filename problem in safari download.

Browse Source
This commit is contained in:
cuihaikuo
2017-09-23 17:05:29 +08:00
committed by Jonathan Xu
parent e69809b720
commit 229c300ee8
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/access-file.c
View File

@@ -560,17 +560,13 @@ do_file(evhtp_request_t *req, SeafRepo *repo, const char *file_id,
evhtp_header_new("Content-Length", file_size, 1, 1)); evhtp_header_new("Content-Length", file_size, 1, 1));
if (strcmp(operation, "download") == 0) { if (strcmp(operation, "download") == 0) {
if (test_firefox (req)) { /* Safari doesn't support 'utf8', 'utf-8' is compatible with most of browsers. */
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename*=\"utf8\' \'%s\"", filename); "attachment;filename*=\"utf-8\' \'%s\"", filename);
} else {
snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename=\"%s\"", filename);
}
} else { } else {
if (test_firefox (req)) { if (test_firefox (req)) {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"inline;filename*=\"utf8\' \'%s\"", filename); "inline;filename*=\"utf-8\' \'%s\"", filename);
} else { } else {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"inline;filename=\"%s\"", filename); "inline;filename=\"%s\"", filename);
@@ -847,7 +843,7 @@ set_resp_disposition (evhtp_request_t *req, const char *operation,
if (strcmp(operation, "download") == 0) { if (strcmp(operation, "download") == 0) {
if (test_firefox (req)) { if (test_firefox (req)) {
cont_filename = g_strdup_printf("attachment;filename*=\"utf8\' \'%s\"", cont_filename = g_strdup_printf("attachment;filename*=\"utf-8\' \'%s\"",
filename); filename);
} else { } else {
@@ -855,7 +851,7 @@ set_resp_disposition (evhtp_request_t *req, const char *operation,
} }
} else { } else {
if (test_firefox (req)) { if (test_firefox (req)) {
cont_filename = g_strdup_printf("inline;filename*=\"utf8\' \'%s\"", cont_filename = g_strdup_printf("inline;filename*=\"utf-8\' \'%s\"",
filename); filename);
} else { } else {
cont_filename = g_strdup_printf("inline;filename=\"%s\"", filename); cont_filename = g_strdup_printf("inline;filename=\"%s\"", filename);
@@ -1002,7 +998,7 @@ start_download_zip_file (evhtp_request_t *req, const char *token,
if (test_firefox (req)) { if (test_firefox (req)) {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename*=\"utf8\' \'%s.zip\"", zipname); "attachment;filename*=\"utf-8\' \'%s.zip\"", zipname);
} else { } else {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename=\"%s.zip\"", zipname); "attachment;filename=\"%s.zip\"", zipname);
@@ -1332,7 +1328,7 @@ do_block(evhtp_request_t *req, SeafRepo *repo, const char *file_id,
if (test_firefox (req)) { if (test_firefox (req)) {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename*=\"utf8\' \'%s\"", blk_id); "attachment;filename*=\"utf-8\' \'%s\"", blk_id);
} else { } else {
snprintf(cont_filename, SEAF_PATH_MAX, snprintf(cont_filename, SEAF_PATH_MAX,
"attachment;filename=\"%s\"", blk_id); "attachment;filename=\"%s\"", blk_id);