diff options
Diffstat (limited to 'modules/caddyhttp/templates')
| -rw-r--r-- | modules/caddyhttp/templates/templates.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go index c659f6b..e329e2e 100644 --- a/modules/caddyhttp/templates/templates.go +++ b/modules/caddyhttp/templates/templates.go @@ -6,6 +6,7 @@ import ( "io" "net/http" "strconv" + "strings" "github.com/caddyserver/caddy" "github.com/caddyserver/caddy/modules/caddyhttp" @@ -37,14 +38,21 @@ func (t *Templates) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy buf.Reset() defer bufPool.Put(buf) - rr := caddyhttp.NewResponseRecorder(w, buf) + shouldBuf := func(status int) bool { + return strings.HasPrefix(w.Header().Get("Content-Type"), "text/") + } + + rec := caddyhttp.NewResponseRecorder(w, buf, shouldBuf) - err := next.ServeHTTP(rr, r) + err := next.ServeHTTP(rec, r) if err != nil { return err } + if !rec.Buffered() { + return nil + } - err = t.executeTemplate(rr, r) + err = t.executeTemplate(rec, r) if err != nil { return err } @@ -54,7 +62,7 @@ func (t *Templates) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy w.Header().Del("Etag") // don't know a way to quickly generate etag for dynamic content w.Header().Del("Last-Modified") // useless for dynamic content since it's always changing - w.WriteHeader(rr.Status()) + w.WriteHeader(rec.Status()) io.Copy(w, buf) return nil |