Skip to content

C
caddy
Commit ce0988f4 authored by Wèi Cōngruì's avatar Wèi Cōngruì Committed by Matt Holt
Browse files
Options

templates: delete ETag and Last-Modified headers (#2338) 

Fixes #1920
parent 1c92557c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
caddyhttp/templates/templates.go
View file @ ce0988f4
...@@ -110,6 +110,10 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error ...@@ -110,6 +110,10 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
// set the actual content length now that the template was executed // set the actual content length now that the template was executed
w.Header().Set("Content-Length", strconv.Itoa(buf.Len())) w.Header().Set("Content-Length", strconv.Itoa(buf.Len()))
// delete the headers related to cache
w.Header().Del("ETag")
w.Header().Del("Last-Modified")
// get the modification time in preparation for http.ServeContent // get the modification time in preparation for http.ServeContent
modTime, _ := time.Parse(http.TimeFormat, w.Header().Get("Last-Modified")) modTime, _ := time.Parse(http.TimeFormat, w.Header().Get("Last-Modified"))
......
caddyhttp/templates/templates_test.go
View file @ ce0988f4
...@@ -70,6 +70,7 @@ func TestTemplates(t *testing.T) { ...@@ -70,6 +70,7 @@ func TestTemplates(t *testing.T) {
req string req string
respCode int respCode int
res string res string
bypass bool
}{ }{
{ {
tpl: tmpl, tpl: tmpl,
...@@ -113,6 +114,7 @@ func TestTemplates(t *testing.T) { ...@@ -113,6 +114,7 @@ func TestTemplates(t *testing.T) {
respCode: http.StatusOK, respCode: http.StatusOK,
res: `<!DOCTYPE html><html><head><title>as it is</title></head><body>{{.Include "header.html"}}</body></html> res: `<!DOCTYPE html><html><head><title>as it is</title></head><body>{{.Include "header.html"}}</body></html>
`, `,
bypass: true,
}, },
} { } {
c := c c := c
...@@ -135,6 +137,14 @@ func TestTemplates(t *testing.T) { ...@@ -135,6 +137,14 @@ func TestTemplates(t *testing.T) {
if respBody != c.res { if respBody != c.res {
t.Fatalf("Test: the expected body %v is different from the response one: %v", c.res, respBody) t.Fatalf("Test: the expected body %v is different from the response one: %v", c.res, respBody)
} }
if !c.bypass {
eTag := rec.Header().Get("ETag")
lastModified := rec.Header().Get("Last-Modified")
if eTag != "" || lastModified != "" {
t.Fatalf("Test: expect a response without ETag or Last-Modified, got %v %v", eTag, lastModified)
}
}
}) })
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7