go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-06-22 22:37:41 +02:00
Code Releases Activity

Make the expires option set Expires and Cache-Control headers

Browse Source
This commit is contained in:
DarthSim
2023-02-24 19:44:03 +03:00
parent 41b9cfbc6e
commit 50d04d585e
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
processing_handler.go
View File

@ -55,10 +55,16 @@ func initProcessingHandler() {
headerVaryValue = strings.Join(vary, ", ")
}
func setCacheControl(rw http.ResponseWriter, originHeaders map[string]string) {
func setCacheControl(rw http.ResponseWriter, force *time.Time, originHeaders map[string]string) {
var cacheControl, expires string
var ttl int
if force != nil {
rw.Header().Set("Cache-Control", fmt.Sprintf("max-age=%d, public", int(time.Until(*force).Seconds())))
rw.Header().Set("Expires", force.Format(http.TimeFormat))
return
}
if config.CacheControlPassthrough && originHeaders != nil {
if val, ok := originHeaders["Cache-Control"]; ok && len(val) > 0 {
cacheControl = val
@ -115,7 +121,7 @@ func respondWithImage(reqID string, r *http.Request, rw http.ResponseWriter, sta
rw.Header().Set("Content-DPR", strconv.FormatFloat(po.Dpr, 'f', 2, 32))
}
setCacheControl(rw, originData.Headers)
setCacheControl(rw, po.Expires, originData.Headers)
setVary(rw)
setCanonical(rw, originURL)
@ -143,7 +149,7 @@ func respondWithImage(reqID string, r *http.Request, rw http.ResponseWriter, sta
}
func respondWithNotModified(reqID string, r *http.Request, rw http.ResponseWriter, po *options.ProcessingOptions, originURL string, originHeaders map[string]string) {
setCacheControl(rw, originHeaders)
setCacheControl(rw, po.Expires, originHeaders)
setVary(rw)
rw.WriteHeader(304)