forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

RPC: Accept gzip encoding

Browse source
This commit is contained in:
Preston Van Loon 2020-01-09 12:24:05 -08:00
parent b211742e5f
commit 36541669cc
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rpc/http.go
View file

@ -18,6 +18,7 @@ package rpc
import ( import (
"bytes" "bytes"
"compress/gzip"
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
@ -38,6 +39,7 @@ import (
const ( const (
maxRequestContentLength = 1024 * 1024 * 5 maxRequestContentLength = 1024 * 1024 * 5
contentType = "application/json" contentType = "application/json"
acceptContentEncoding = "gzip"
) )
// https://www.jsonrpc.org/historical/json-rpc-over-http.html#id13 // https://www.jsonrpc.org/historical/json-rpc-over-http.html#id13
@ -113,6 +115,7 @@ func DialHTTPWithClient(endpoint string, client *http.Client) (*Client, error) {
} }
req.Header.Set("Content-Type", contentType) req.Header.Set("Content-Type", contentType)
req.Header.Set("Accept", contentType) req.Header.Set("Accept", contentType)
req.Header.Set("Accept-Encoding", acceptContentEncoding)
initctx := context.Background() initctx := context.Background()
return newClient(initctx, func(context.Context) (ServerCodec, error) { return newClient(initctx, func(context.Context) (ServerCodec, error) {
@ -179,10 +182,17 @@ func (hc *httpConn) doRequest(ctx context.Context, msg interface{}) (io.ReadClos
if err != nil { if err != nil {
return nil, err return nil, err
} }
if resp.StatusCode < 200 || resp.StatusCode >= 300 { b := resp.Body
return resp.Body, errors.New(resp.Status) if !resp.Uncompressed && resp.Header.Get("Content-Encoding") == "gzip" {
b, err = gzip.NewReader(resp.Body)
if err != nil {
return nil, err
}
} }
return resp.Body, nil if resp.StatusCode < 200 || resp.StatusCode >= 300 {
return b, errors.New(resp.Status)
}
return b, nil
} }
// httpServerConn turns a HTTP connection into a Conn. // httpServerConn turns a HTTP connection into a Conn.