rpc: fix formatting errors from merge conflicts

This commit is contained in:
Armani Ferrante 2017-11-16 14:58:20 -08:00
parent 3530d5ef40
commit 08f1dd5477

View file

@ -147,10 +147,10 @@ func NewHTTPServer(cors []string, srv *Server) *http.Server {
// ServeHTTP serves JSON-RPC requests over HTTP. // ServeHTTP serves JSON-RPC requests over HTTP.
func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Permit dumb empty requests for remote health-checks (AWS) // Permit dumb empty requests for remote health-checks (AWS)
if r.Method == "GET" && r.ContentLength == 0 && r.URL.RawQuery == "" { if r.Method == "GET" && r.ContentLength == 0 && r.URL.RawQuery == "" {
return return
} }
if responseCode, errorMessage := httpErrorResponse(r); responseCode != 0 { if responseCode, errorMessage := httpErrorResponse(r); responseCode != 0 {
http.Error(w, errorMessage, responseCode) http.Error(w, errorMessage, responseCode)
return return