Merge pull request #5358
3c77714
Make -proxy set all network types, avoiding a connect leak. (Gregory Maxwell)
This commit is contained in:
commit
6f9e67aca7
1 changed files with 2 additions and 4 deletions
|
@ -854,10 +854,8 @@ bool AppInit2(boost::thread_group& threadGroup)
|
||||||
if (!addrProxy.IsValid())
|
if (!addrProxy.IsValid())
|
||||||
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"]));
|
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"]));
|
||||||
|
|
||||||
if (!IsLimited(NET_IPV4))
|
SetProxy(NET_IPV4, addrProxy);
|
||||||
SetProxy(NET_IPV4, addrProxy);
|
SetProxy(NET_IPV6, addrProxy);
|
||||||
if (!IsLimited(NET_IPV6))
|
|
||||||
SetProxy(NET_IPV6, addrProxy);
|
|
||||||
SetNameProxy(addrProxy);
|
SetNameProxy(addrProxy);
|
||||||
fProxy = true;
|
fProxy = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue