GOMODULES
/
fiber
mirror of https://github.com/gofiber/fiber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #622 from kiyonlin/fix-fs-data-race 

👷 fix data race in sendFile test
pull/624/head
fenny 2020-07-15 21:08:23 -04:00 committed by GitHub
parent 407decd69e df19f6d933
commit 9dc7890f4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctx.go
View File

@ -876,6 +876,7 @@ func (ctx *Ctx) SendBytes(body []byte) {
ctx.Fasthttp.Response.SetBodyRaw(body) ctx.Fasthttp.Response.SetBodyRaw(body)
} }
var fsOnce sync.Once
var sendFileFS *fasthttp.FS var sendFileFS *fasthttp.FS
var sendFileHandler fasthttp.RequestHandler var sendFileHandler fasthttp.RequestHandler
@ -884,7 +885,7 @@ var sendFileHandler fasthttp.RequestHandler
// Sets the Content-Type response HTTP header field based on the filenames extension. // Sets the Content-Type response HTTP header field based on the filenames extension.
func (ctx *Ctx) SendFile(file string, compress ...bool) error { func (ctx *Ctx) SendFile(file string, compress ...bool) error {
// https://github.com/valyala/fasthttp/blob/master/fs.go#L81 // https://github.com/valyala/fasthttp/blob/master/fs.go#L81
if sendFileFS == nil { fsOnce.Do(func() {
sendFileFS = &fasthttp.FS{ sendFileFS = &fasthttp.FS{
Root: "/", Root: "/",
GenerateIndexPages: false, GenerateIndexPages: false,
@ -898,7 +899,8 @@ func (ctx *Ctx) SendFile(file string, compress ...bool) error {
}, },
} }
sendFileHandler = sendFileFS.NewRequestHandler() sendFileHandler = sendFileFS.NewRequestHandler()
} })
// Keep original path for mutable params // Keep original path for mutable params
ctx.pathOriginal = utils.ImmutableString(ctx.pathOriginal) ctx.pathOriginal = utils.ImmutableString(ctx.pathOriginal)
// Disable compression // Disable compression