potyarkin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

vendor: update all dependencies

Browse source
This commit is contained in:
Nick Craig-Wood 2020-06-27 15:45:12 +01:00
parent 61ff7306ae
commit 696d012c05
952 changed files with 121647 additions and 34334 deletions
Download patch file Download diff file Expand all files Collapse all files

15
vendor/github.com/mattn/go-ieproxy/ieproxy_windows.go generated vendored
View file

@ -42,22 +42,15 @@ func writeConf() {
autoDetect = ieCfg.fAutoDetect
}
if proxy == "" { // <- new. Only fallback if we got NO proxy
if proxy == "" && !autoDetect{
// Try WinHTTP default proxy.
if defaultCfg, err := getDefaultProxyConfiguration(); err == nil {
defer globalFreeWrapper(defaultCfg.lpszProxy)
defer globalFreeWrapper(defaultCfg.lpszProxyBypass)
// Changed, next 2 lines, so if that if we always set both of these (they are a pair, it doesn't make sense to set one here and keep the value of the other from above)
newProxy := StringFromUTF16Ptr(defaultCfg.lpszProxy)
if proxy == "" {
proxy = newProxy
}
newProxyByPass := StringFromUTF16Ptr(defaultCfg.lpszProxyBypass)
if proxyByPass == "" {
proxyByPass = newProxyByPass
}
// Always set both of these (they are a pair, it doesn't make sense to set one here and keep the value of the other from above)
proxy = StringFromUTF16Ptr(defaultCfg.lpszProxy)
proxyByPass = StringFromUTF16Ptr(defaultCfg.lpszProxyBypass)
}
}