allow for appropriate content-type to be set (#36545) (#36550)

(cherry picked from commit 2616580bae)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2021-07-08 11:35:42 +02:00
committed by GitHub
co-authored by Will Browne
parent d9858e0af9
commit 4c16d55e11
+1 -3
View File
@@ -294,14 +294,12 @@ func (hs *HTTPServer) GetPluginAssets(c *models.ReqContext) response.Response {
}
resp := response.CreateNormalResponse(
http.Header{"Content-Type": []string{"text/plain", "charset=utf-8"}},
http.Header{"Cache-Control": []string{"public", "max-age=3600"}},
[]byte{},
200)
if hs.Cfg.Env == setting.Dev {
resp.SetHeader("Cache-Control", "max-age=0, must-revalidate, no-cache")
} else {
resp.SetHeader("Cache-Control", "public, max-age=3600")
}
http.ServeContent(resp, c.Req.Request, pluginFilePath, fi.ModTime(), f)