diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-04-17 13:41:14 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-04-17 13:41:16 +0200 |
| commit | 2074d7df20ebc100db6a7b2c3b784ef0bdb8753f (patch) | |
| tree | 9d6de458023e6781955bfea176a10433196d0667 /src/policy/fees.h | |
| parent | d1b3dfb275fd98e37cfe8a0f7cea7d03595af2e8 (diff) | |
| parent | 3429d67014095b42a976d95c3ef8622d5fe085e6 (diff) | |
| download | bitcoin-2074d7df20ebc100db6a7b2c3b784ef0bdb8753f.tar.xz | |
Merge bitcoin/bitcoin#24837: init: Prevent -noproxy and -proxy=0 from interacting with other settings
3429d67014095b42a976d95c3ef8622d5fe085e6 init: Prevent -noproxy and -proxy=0 settings from interacting with other settings (Ryan Ofsky)
Pull request description:
Prevent `-noproxy` and `-proxy=0` settings from interacting with `-listen`, `-upnp`, and `-natpmp` settings.
These settings started being handled inconsistently in the `AppInitMain` and `InitParameterInteraction` functions starting in commit baf05075fae2cc2625a2a74b35cc66902f3cbfa3 from #6272:
https://github.com/bitcoin/bitcoin/blob/baf05075fae2cc2625a2a74b35cc66902f3cbfa3/src/init.cpp#L990-L991
https://github.com/bitcoin/bitcoin/blob/baf05075fae2cc2625a2a74b35cc66902f3cbfa3/src/init.cpp#L687
This commit changes both functions to handle proxy arguments the same way so
there are not side effects from specifying a proxy=0 setting.
This change was originally part of #24830 but really is independent and makes more sense as a separate PR
ACKs for top commit:
hebasto:
ACK 3429d67014095b42a976d95c3ef8622d5fe085e6, tested on Ubuntu 22.04.
Tree-SHA512: c4c6b4aeb3c07321700e974c16fd47a1bd3d469f273a6b308a69638db81c88c4e67208fddc96fcda9c8bd85f3ae22c98ca131c9622895edaa34eb65c194f35db
Diffstat (limited to 'src/policy/fees.h')
0 files changed, 0 insertions, 0 deletions