Merge pull request #5358

3c77714 Make -proxy set all network types, avoiding a connect leak. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan 2014-11-24 15:30:22 +01:00
commit 6f9e67aca7
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -854,9 +854,7 @@ 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);
if (!IsLimited(NET_IPV6))
SetProxy(NET_IPV6, addrProxy); SetProxy(NET_IPV6, addrProxy);
SetNameProxy(addrProxy); SetNameProxy(addrProxy);
fProxy = true; fProxy = true;