Skip to content

fix messy code when send_file text #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix messy code when send_file text #131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cba327f
fix messy code when send_file text
bingoohuang Mar 15, 2025
a7eade3
Refactor content type handling to explicitly specify UTF-8 encoding f…
bingoohuang Mar 17, 2025
c04d6ea
Add support for YAML content type in UTF-8 encoding handling
bingoohuang Mar 17, 2025
e71e845
可执行文件大小优化
bingoohuang Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,15 @@ impl MainHandler {
let mime = mime_types::from_path(path).first_or_octet_stream();
resp.headers
.set_raw("content-type", vec![mime.to_string().into_bytes()]);

// 修复中文乱码问题：对于文本类型的文件，明确指定 UTF-8 编码
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English comment please.

let content_type = if mime.type_() == "text" {
format!("{}; charset=utf-8", mime)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the type is text, first read the content (at most 512 bytes), and use chardet to detect the encoding.

} else {
mime.to_string()
};
resp.headers.set_raw("content-type", vec![content_type.into_bytes()]);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content-type already set in line:923


if self.coop {
resp.headers.set_raw(
"Cross-Origin-Opener-Policy",
Expand Down
7 changes: 7 additions & 0 deletions tests/hello.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Language (English) "Hello, World!" Translation
English Hello, World!
Chinese (Simplified) 你好，世界！ (Nǐ hǎo, shìjiè!)
Russian Здравствуй, мир! (Zdravstvuy, mir!)
Japanese こんにちは、世界！ (Konnichiwa, sekai!)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is unnecessary.