Merge pull request #9 from danielwhite/fix-content-types

Fix generation of content types
mailhog · Oct 6, 2015 · d78b1cc · d78b1cc
2 parents bc6dbdc + 896b571
commit d78b1cc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/web/web.go b/web/web.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"mime"
 	"net/http"
+	"path/filepath"
 	"strings"
 
 	"github.com/gorilla/pat"
@@ -38,7 +39,9 @@ func (web Web) Static(pattern string) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
 		fp := strings.TrimSuffix(pattern, "{{file}}") + req.URL.Query().Get(":file")
 		if b, err := web.asset(fp); err == nil {
-			w.Header().Set("Content-Type", mime.TypeByExtension(fp))
+			ext := filepath.Ext(fp)
+
+			w.Header().Set("Content-Type", mime.TypeByExtension(ext))
 			w.WriteHeader(200)
 			w.Write(b)
 			return
@@ -102,6 +105,7 @@ func (web Web) Index() func(http.ResponseWriter, *http.Request) {
 			return
 		}
 
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 		w.WriteHeader(200)
 		w.Write(b.Bytes())
 	}