Skip to content
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

fix #2203: omit the charset attribute when Content-Type is text/html #6743

Merged
merged 7 commits into from
Dec 2, 2019
Merged

fix #2203: omit the charset attribute when Content-Type is text/html #6743

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aefff48
fix #2203: omit the charset attribute when Content-Type is text/html
djalilhebal Nov 2, 2019
69f81a1
Update gateway_handler.go
djalilhebal Nov 5, 2019
a29a9db
gateway: ServeFile: use file extension to determine Content-Type
djalilhebal Nov 6, 2019
ebf2e7d
chore(gateway): fix import ordering
Stebalien Nov 6, 2019
a12d2e2
chore(gateway): fix error call
Stebalien Nov 6, 2019
69f6e08
chore(gateway): remove redundant seek
Stebalien Nov 6, 2019
7ae6f6f
chore(gateway): document encoding fix
Stebalien Nov 6, 2019
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 core/corehttp/gateway_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,15 @@ func (i *gatewayHandler) serveFile(w http.ResponseWriter, req *http.Request, nam
}
}

buf := make([]byte, 512)
_, _ = content.Read(buf)
djalilhebal marked this conversation as resolved.
Show resolved Hide resolved
mime := http.DetectContentType(buf)

if strings.HasPrefix(mime, "text/html;") {
mime = "text/html"
}
w.Header().Set("Content-Type", mime)
djalilhebal marked this conversation as resolved.
Show resolved Hide resolved

http.ServeContent(w, req, name, modtime, content)
djalilhebal marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down