mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-22 02:48:59 +00:00
lib/assets: MIME types, time formats (#8351)
.eot and .woff2 weren't listed, but are present in vendored fontawesome. .ttf and .woff are font/* according to IANA, https://www.iana.org/assignments/media-types/media-types.xhtml#font. This matches what mime.TypeByExtension returns. .eot is from https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types. mime.TypeByExtension doesn't recognize this extension. * lib/assets: Use http.ParseTime This understands the three time formats allowed in HTTP.
This commit is contained in:
parent
e3078cc531
commit
2ca8a5ac61
@ -44,7 +44,7 @@ func Serve(w http.ResponseWriter, r *http.Request, asset Asset) {
|
|||||||
header.Set("ETag", etag)
|
header.Set("ETag", etag)
|
||||||
header.Set("Last-Modified", asset.Modified.Format(http.TimeFormat))
|
header.Set("Last-Modified", asset.Modified.Format(http.TimeFormat))
|
||||||
|
|
||||||
t, err := time.Parse(http.TimeFormat, r.Header.Get("If-Modified-Since"))
|
t, err := http.ParseTime(r.Header.Get("If-Modified-Since"))
|
||||||
if err == nil && !asset.Modified.After(t) {
|
if err == nil && !asset.Modified.After(t) {
|
||||||
w.WriteHeader(http.StatusNotModified)
|
w.WriteHeader(http.StatusNotModified)
|
||||||
return
|
return
|
||||||
@ -86,18 +86,22 @@ func MimeTypeForFile(file string) string {
|
|||||||
return "text/html; charset=utf-8"
|
return "text/html; charset=utf-8"
|
||||||
case ".css":
|
case ".css":
|
||||||
return "text/css; charset=utf-8"
|
return "text/css; charset=utf-8"
|
||||||
|
case ".eot":
|
||||||
|
return "application/vnd.ms-fontobject"
|
||||||
case ".js":
|
case ".js":
|
||||||
return "application/javascript; charset=utf-8"
|
return "application/javascript; charset=utf-8"
|
||||||
case ".json":
|
case ".json":
|
||||||
return "application/json; charset=utf-8"
|
return "application/json; charset=utf-8"
|
||||||
case ".png":
|
case ".png":
|
||||||
return "image/png"
|
return "image/png"
|
||||||
case ".ttf":
|
|
||||||
return "application/x-font-ttf"
|
|
||||||
case ".woff":
|
|
||||||
return "application/x-font-woff"
|
|
||||||
case ".svg":
|
case ".svg":
|
||||||
return "image/svg+xml; charset=utf-8"
|
return "image/svg+xml; charset=utf-8"
|
||||||
|
case ".ttf":
|
||||||
|
return "font/ttf"
|
||||||
|
case ".woff":
|
||||||
|
return "font/woff"
|
||||||
|
case ".woff2":
|
||||||
|
return "font/woff2"
|
||||||
default:
|
default:
|
||||||
return mime.TypeByExtension(ext)
|
return mime.TypeByExtension(ext)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user