From cf18fcfc1ee170d990beabf1e195679b41abbca4 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 15 May 2024 05:04:28 +1000 Subject: [PATCH] Use NewSingleHostReverseProxy (#3480) --- v2/pkg/assetserver/assethandler_external.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/v2/pkg/assetserver/assethandler_external.go b/v2/pkg/assetserver/assethandler_external.go index d80211cfe..98b3404e9 100644 --- a/v2/pkg/assetserver/assethandler_external.go +++ b/v2/pkg/assetserver/assethandler_external.go @@ -3,12 +3,10 @@ package assetserver import ( "errors" "fmt" + "github.com/wailsapp/wails/v2/pkg/options/assetserver" "net/http" "net/http/httputil" "net/url" - "runtime" - - "github.com/wailsapp/wails/v2/pkg/options/assetserver" ) func NewProxyServer(proxyURL string) http.Handler { @@ -16,10 +14,7 @@ func NewProxyServer(proxyURL string) http.Handler { if err != nil { panic(err) } - return NewExternalAssetsHandler(nil, - assetserver.Options{}, - parsedURL) - + return httputil.NewSingleHostReverseProxy(parsedURL) } func NewExternalAssetsHandler(logger Logger, options assetserver.Options, url *url.URL) http.Handler { @@ -68,7 +63,7 @@ func NewExternalAssetsHandler(logger Logger, options assetserver.Options, url *u var result http.Handler = http.HandlerFunc( func(rw http.ResponseWriter, req *http.Request) { - if runtime.GOOS == "darwin" || req.Method == http.MethodGet { + if req.Method == http.MethodGet { proxy.ServeHTTP(rw, req) return }