diff --git a/build/windows/installer/wails_tools.nsh b/build/windows/installer/wails_tools.nsh index 5956ca6..94d403d 100644 --- a/build/windows/installer/wails_tools.nsh +++ b/build/windows/installer/wails_tools.nsh @@ -14,7 +14,7 @@ !define INFO_PRODUCTNAME "res-downloader" !endif !ifndef INFO_PRODUCTVERSION - !define INFO_PRODUCTVERSION "3.1.1" + !define INFO_PRODUCTVERSION "3.1.3" !endif !ifndef INFO_COPYRIGHT !define INFO_COPYRIGHT "Copyright © 2023" diff --git a/core/proxy.go b/core/proxy.go index 6fe953a..32fd809 100644 --- a/core/proxy.go +++ b/core/proxy.go @@ -120,10 +120,14 @@ func (p *Proxy) setTransport() { IdleConnTimeout: 30 * time.Second, } + p.Proxy.ConnectDial = nil + p.Proxy.ConnectDialWithReq = nil + if globalConfig.UpstreamProxy != "" && globalConfig.OpenProxy && !strings.Contains(globalConfig.UpstreamProxy, globalConfig.Port) { proxyURL, err := url.Parse(globalConfig.UpstreamProxy) if err == nil { transport.Proxy = http.ProxyURL(proxyURL) + p.Proxy.ConnectDial = p.Proxy.NewConnectDialToProxy(globalConfig.UpstreamProxy) } } p.Proxy.Tr = transport