aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/ws/server.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-27 03:21:41 +0800
committerobscuren <geffobscura@gmail.com>2015-02-27 03:21:41 +0800
commit76f6d75ef867e754264834fc7171d1a12f24c5bb (patch)
treea9531d9e14c15abd72625a98a21a9b988dc32319 /rpc/ws/server.go
parentb2a225a52e45315f3ec90e11707fefa6059d13f5 (diff)
parentfa7deb10f636d89f668249b78792f8cc48146ee8 (diff)
downloaddexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.gz
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.bz2
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.lz
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.xz
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.zst
dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.zip
Merge branch 'master' into hotfix/0.8.5-2
Diffstat (limited to 'rpc/ws/server.go')
-rw-r--r--rpc/ws/server.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/ws/server.go b/rpc/ws/server.go
index b8cc2fa6b..2c2988f5d 100644
--- a/rpc/ws/server.go
+++ b/rpc/ws/server.go
@@ -99,7 +99,7 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler {
// reqParsed, reqerr := JSON.ParseRequestBody(conn.Request())
if err := websocket.JSON.Receive(conn, &reqParsed); err != nil {
- jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest}
+ jsonerr := &rpc.RpcErrorObject{-32700, "Error: Could not parse request"}
JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
continue
}