1
0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-12-03 23:19:17 +02:00

Move download options to imagedata.DownloadOptions

This commit is contained in:
DarthSim
2023-02-23 21:39:52 +03:00
parent 26cd81dcf3
commit aa80dc022f
3 changed files with 19 additions and 14 deletions

View File

@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"net/http"
"net/http/cookiejar"
"strconv"
"strings"
"time"
@@ -288,14 +287,17 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
originData, err := func() (*imagedata.ImageData, error) {
defer metrics.StartDownloadingSegment(ctx)()
var cookieJar *cookiejar.Jar
downloadOpts := imagedata.DownloadOptions{
Header: imgRequestHeader,
CookieJar: nil,
}
if config.CookiePassthrough {
cookieJar, err = cookies.JarFromRequest(r)
downloadOpts.CookieJar, err = cookies.JarFromRequest(r)
checkErr(ctx, "download", err)
}
return imagedata.Download(imageURL, "source image", imgRequestHeader, cookieJar, po.SecurityOptions)
return imagedata.Download(imageURL, "source image", downloadOpts, po.SecurityOptions)
}()
if err == nil {