diff options
| author | kazcw <keziahw@gmail.com> | 2014-06-28 18:14:36 -0700 |
|---|---|---|
| committer | kazcw <keziahw@gmail.com> | 2014-06-28 19:16:15 -0700 |
| commit | 16f33f163d4e2c10320a96a22bbab71c9a0df195 (patch) | |
| tree | 79b08ef53736fad40976c529142530cd42689f1f /src/rpcprotocol.h | |
| parent | 7b8fc9d8ad4791269fb8439126b5ceff39217f56 (diff) | |
| download | bitcoin-16f33f163d4e2c10320a96a22bbab71c9a0df195.tar.xz | |
fix RPC error replies
After pull #4288, RPC messages indicating errors have a Content-Length unrelated
to their actual contents, rendering bitcoin-cli and curl unable to decode the
reply.
This patch sets the Content-Length field based on the actual content returned.
Additionally, pull #4288 clobbered the error descriptions provided in
ErrorReply, which bitcoin-cli relies upon; this patch moves #4288 http-error
descriptions to an HTTPError method, allowing HTTPReply to pass content on
unchanged.
Diffstat (limited to 'src/rpcprotocol.h')
| -rw-r--r-- | src/rpcprotocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index f1317e9c28..5627077bfb 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -141,6 +141,8 @@ private: }; std::string HTTPPost(const std::string& strMsg, const std::map<std::string,std::string>& mapRequestHeaders); +std::string HTTPError(int nStatus, bool keepalive, + bool headerOnly = false); std::string HTTPReply(int nStatus, const std::string& strMsg, bool keepalive, bool headerOnly = false, const char *contentType = "application/json"); |