Merge pull request #5420

6b4feb8 [QA] rest.py RPC test: change setgenerate() to generate() (Jonas Schnelli) 97ee866 [REST] getutxos REST command (based on Bip64) (Jonas Schnelli)
2015-05-06 16:42:54 +02:00
parent 12f3488253 6b4feb89a8
commit 1fd2d39529
5 changed files with 414 additions and 26 deletions
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -239,6 +239,7 @@ extern json_spirit::Value reconsiderblock(const json_spirit::Array& params, bool
 // in rest.cpp
 extern bool HTTPReq_REST(AcceptedConnection *conn,
                  const std::string& strURI,
+                  const std::string& strRequest,
                  const std::map<std::string, std::string>& mapHeaders,
                  bool fRun);