github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

templates: Merge pull request #1482 from crvv/master

Browse Source 
templates: Set MIME type
This commit is contained in:
Matt Holt 2017-03-09 17:26:08 -07:00 committed by GitHub
commit 2be0dc40f0
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
caddyhttp/templates/templates.go
View File

@ -4,6 +4,7 @@ package templates
import (
"bytes"
"mime"
"net/http"
"os"
"path"
@ -62,6 +63,16 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
return http.StatusInternalServerError, err
}
// If Content-Type isn't set here, http.ResponseWriter.Write
// will set it according to response body. But other middleware
// such as gzip can modify response body, then Content-Type
// detected by http.ResponseWriter.Write is wrong.
ctype := mime.TypeByExtension(ext)
if ctype == "" {
ctype = http.DetectContentType(buf.Bytes())
}
w.Header().Set("Content-Type", ctype)
templateInfo, err := os.Stat(templatePath)
if err == nil {
// add the Last-Modified header if we were able to read the stamp