diff options
| author | Ryan Ofsky <ryan@ofsky.org> | 2022-04-12 03:00:28 -0400 |
|---|---|---|
| committer | Ryan Ofsky <ryan@ofsky.org> | 2022-04-26 10:09:39 -0400 |
| commit | 1d4122dfefcb0a33c3d5bf7bbe2c7cd7e09d3764 (patch) | |
| tree | d11be998fc19ca96b166d8f1f8c9b6ba84d1bc72 /src/util/system.h | |
| parent | f4005af3ec455a7fcfb94aa1a6673e821ac3d743 (diff) | |
| download | bitcoin-1d4122dfefcb0a33c3d5bf7bbe2c7cd7e09d3764.tar.xz | |
init: Allow -proxy="" setting values
This drops the `No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>`
error when a empty `-proxy=` command line argument, `bitcoin.conf` value, or
`settings.json` value is specified, and just makes bitcoin connect and listen
normally in these cases.
The error was originally added in https://github.com/bitcoin/bitcoin/pull/20003
to prevent a bare `-proxy` command line argument with no assignment from
clearing proxy settings. But it was implemented in an overbroad way breaking
empty `-proxy=` assignments as well.
The motivation for this change is to prevent a GUI bug that happens with
https://github.com/bitcoin/bitcoin/pull/15936, reported in
https://github.com/bitcoin/bitcoin/pull/15936#pullrequestreview-937685759 by
vasild, that happens after a proxy setting is enabled and disabled in the GUI.
But this change also makes sense on its own to remove a potentially confusing
error message.
Diffstat (limited to 'src/util/system.h')
| -rw-r--r-- | src/util/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/util/system.h b/src/util/system.h index a66b597d41..96f5b51bf4 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -175,6 +175,7 @@ public: // ALLOW_STRING = 0x08, //!< unimplemented, draft implementation in #16545 // ALLOW_LIST = 0x10, //!< unimplemented, draft implementation in #16545 DISALLOW_NEGATION = 0x20, //!< disallow -nofoo syntax + DISALLOW_ELISION = 0x40, //!< disallow -foo syntax that doesn't assign any value DEBUG_ONLY = 0x100, /* Some options would cause cross-contamination if values for |