diff options
author | Jeff Garzik <jgarzik@bitpay.com> | 2014-11-18 10:17:22 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@bitpay.com> | 2014-11-18 10:17:22 -0500 |
commit | 9445b876bde34c0cc4ca9cb16fbd763fe877b8a9 (patch) | |
tree | a0d798f367f55d84ab229362e2a4432229a37fe2 /src/rpcserver.cpp | |
parent | 27b2288f33af7d32dd4ece141c12aa1472407b9f (diff) | |
parent | e2655e0ab1fc36cd4a58a5145c53500cb7b2d4d0 (diff) |
Merge pull request #2844
Diffstat (limited to 'src/rpcserver.cpp')
-rw-r--r-- | src/rpcserver.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index cc80887ba4..d072f18e36 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -946,11 +946,18 @@ void ServiceConnection(AcceptedConnection *conn) if (mapHeaders["connection"] == "close") fRun = false; + // Process via JSON-RPC API if (strURI == "/") { if (!HTTPReq_JSONRPC(conn, strRequest, mapHeaders, fRun)) break; + + // Process via HTTP REST API + } else if (strURI.substr(0, 6) == "/rest/") { + if (!HTTPReq_REST(conn, strURI, mapHeaders, fRun)) + break; + } else { - conn->stream() << HTTPError(HTTP_NOT_FOUND, false) << std::flush; + conn->stream() << HTTPReply(HTTP_NOT_FOUND, "", false) << std::flush; break; } } |