diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-26 14:20:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-26 14:30:11 +0100 |
| commit | 108b19f7ef7f9d0bf6c6794bf2be9a12b4cb6400 (patch) | |
| tree | b52b1176ec950b5f798c2f6e0f31b86bd832c4ff /src/rpcserver.cpp | |
| parent | 8ba38aba42c3b65f1ad61699197566d99d2b761a (diff) | |
| parent | 5dc713bfc7bf98c8e1d80fec9c5f5e0417a2bdcd (diff) | |
Merge pull request #5326
5dc713b [REST] set REST API behind "-rest" option (Jonas Schnelli)
78bdc81 [REST] give an appropriate response in warmup phase (Jonas Schnelli)
210eba9 [REST] fix headersonly flag for BINARY responses (Jonas Schnelli)
Diffstat (limited to 'src/rpcserver.cpp')
| -rw-r--r-- | src/rpcserver.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 7022c50375..b03016a508 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -756,6 +756,14 @@ void SetRPCWarmupFinished() fRPCInWarmup = false; } +bool RPCIsInWarmup(std::string *outStatus) +{ + LOCK(cs_rpcWarmup); + if (outStatus) + *outStatus = rpcWarmupStatus; + return fRPCInWarmup; +} + void RPCRunHandler(const boost::system::error_code& err, boost::function<void(void)> func) { if (!err) @@ -947,7 +955,7 @@ void ServiceConnection(AcceptedConnection *conn) break; // Process via HTTP REST API - } else if (strURI.substr(0, 6) == "/rest/") { + } else if (strURI.substr(0, 6) == "/rest/" && GetBoolArg("-rest", false)) { if (!HTTPReq_REST(conn, strURI, mapHeaders, fRun)) break; |