Browse Source

Merge pull request #5358

3c77714 Make -proxy set all network types, avoiding a connect leak. (Gregory Maxwell)
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
6f9e67aca7
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      src/init.cpp

6
src/init.cpp

@ -854,10 +854,8 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -854,10 +854,8 @@ bool AppInit2(boost::thread_group& threadGroup)
if (!addrProxy.IsValid())
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"]));
if (!IsLimited(NET_IPV4))
SetProxy(NET_IPV4, addrProxy);
if (!IsLimited(NET_IPV6))
SetProxy(NET_IPV6, addrProxy);
SetProxy(NET_IPV4, addrProxy);
SetProxy(NET_IPV6, addrProxy);
SetNameProxy(addrProxy);
fProxy = true;
}

Loading…
Cancel
Save