static: surround ETag with quotes (#194)

humaidq · web-flow · commit 002c0ce4d269 · 2020-04-28T19:23:13.000+08:00
diff --git a/static.go b/static.go
@@ -178,7 +178,7 @@ func staticHandler(ctx *Context, log *log.Logger, opt StaticOptions) bool {
 
 	if opt.ETag {
 		tag := GenerateETag(string(fi.Size()), fi.Name(), fi.ModTime().UTC().Format(http.TimeFormat))
-		ctx.Resp.Header().Set("ETag", tag)
+		ctx.Resp.Header().Set("ETag", `"`+tag+`"`)
 	}
 
 	http.ServeContent(ctx.Resp, ctx.Req.Request, file, fi.ModTime(), f)
diff --git a/static_test.go b/static_test.go
@@ -201,7 +201,7 @@ func Test_Static_Options(t *testing.T) {
 		m.ServeHTTP(resp, req)
 		tag := GenerateETag(string(resp.Body.Len()), "macaron.go", resp.Header().Get("last-modified"))
 
-		So(resp.Header().Get("ETag"), ShouldEqual, tag)
+		So(resp.Header().Get("ETag"), ShouldEqual, `"`+tag+`"`)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func staticHandler(ctx Context, log log.Logger, opt StaticOptions) bool {`
`178`	`178`
`179`	`179`	`if opt.ETag {`
`180`	`180`	`tag := GenerateETag(string(fi.Size()), fi.Name(), fi.ModTime().UTC().Format(http.TimeFormat))`
`181`		`- ctx.Resp.Header().Set("ETag", tag)`
	`181`	+ ctx.Resp.Header().Set("ETag", `"`+tag+`"`)
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`http.ServeContent(ctx.Resp, ctx.Req.Request, file, fi.ModTime(), f)`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func Test_Static_Options(t *testing.T) {`
`201`	`201`	`m.ServeHTTP(resp, req)`
`202`	`202`	`tag := GenerateETag(string(resp.Body.Len()), "macaron.go", resp.Header().Get("last-modified"))`
`203`	`203`
`204`		`- So(resp.Header().Get("ETag"), ShouldEqual, tag)`
	`204`	+ So(resp.Header().Get("ETag"), ShouldEqual, `"`+tag+`"`)
`205`	`205`	`})`
`206`	`206`	`}`
`207`	`207`