diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-24 15:30:22 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-24 15:30:31 +0100 |
| commit | 6f9e67aca7ac761481388891d7262f035297ed43 (patch) | |
| tree | 9a4b4898e1d13bd30b127d0bf4bf2d168ad49ac2 /src | |
| parent | 1ee685f984bdeaac7468019c6e2cd4b7d3496aef (diff) | |
| parent | 3c777141349ad82d679a278df0619968af53c23f (diff) | |
| download | bitcoin-6f9e67aca7ac761481388891d7262f035297ed43.tar.xz | |
Merge pull request #5358
3c77714 Make -proxy set all network types, avoiding a connect leak. (Gregory Maxwell)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 2d2a05a936..d2d6858618 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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; } |