diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-21 17:16:00 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-21 17:16:40 +0200 |
| commit | 5e21388c4812e73a15f0e50a9186d154bece27a8 (patch) | |
| tree | 46da064f42fe524c21533984e0827a60550765e0 /contrib | |
| parent | b0ce4508b04639189a6d0567782e27eeee5f73d6 (diff) | |
| parent | ddf98d1d84343f2db0502a85628ef80f2ec57dbd (diff) | |
| download | bitcoin-5e21388c4812e73a15f0e50a9186d154bece27a8.tar.xz | |
Merge pull request #6695
ddf98d1 Make RPC tests cope with server-side timeout between requests (Wladimir J. van der Laan)
2190ea6 rpc: Split option -rpctimeout into -rpcservertimeout and -rpcclienttimeout (Wladimir J. van der Laan)
8b2d6ed http: Disable libevent debug logging, if not explicitly enabled (Wladimir J. van der Laan)
5ce43da init: Ignore SIGPIPE (Wladimir J. van der Laan)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/debian/examples/bitcoin.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf index 62ffd7123a..6aae4ad4d2 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/bitcoin.conf @@ -73,7 +73,7 @@ # How many seconds bitcoin will wait for a complete RPC HTTP request. # after the HTTP connection is established. -#rpctimeout=30 +#rpcclienttimeout=30 # By default, only RPC connections from localhost are allowed. # Specify as many rpcallowip= settings as you like to allow connections from other hosts, |