From 2b5c0d0820c48c3d7735d6ff6be839b4b9762888 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Sun, 22 Apr 2018 15:18:53 +0200 Subject: [PATCH] swarm/api: comment out ioutil.ReadAll --- cmd/swarm/swarm-smoke/upload_and_sync.go | 2 +- swarm/api/http/server.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 542c4508db..1733d19bdc 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -69,7 +69,7 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error { time.Sleep(10 * time.Second) log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash) - res, err := http.Get(endpoint + "/bzz:/" + hash) + res, err := http.Get(endpoint + "/bzz:/" + hash + "/") if err != nil { log.Warn(err.Error(), "ruid", ruid) return err diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 3e0c13470e..54d68ca81f 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -841,20 +841,20 @@ func (s *Server) HandleGetFile(w http.ResponseWriter, r *Request) { return } - var res []byte - res, err = ioutil.ReadAll(reader) - if err != nil { - log.Error("handle.get.file", "ruid", r.ruid, "error", err) - Respond(w, r, fmt.Sprintf("chunk not found %s: %s", r.uri, err), http.StatusNotFound) - return - } - log.Debug("handle.get.file.readall success", "ruid", r.ruid) + //var res []byte + //res, err = ioutil.ReadAll(reader) + //if err != nil { + //log.Error("handle.get.file", "ruid", r.ruid, "error", err) + //Respond(w, r, fmt.Sprintf("chunk not found %s: %s", r.uri, err), http.StatusNotFound) + //return + //} + //log.Debug("handle.get.file.readall success", "ruid", r.ruid) - rdr := bytes.NewReader(res) + //rdr := bytes.NewReader(res) w.Header().Set("Content-Type", contentType) - http.ServeContent(w, &r.Request, "", time.Now(), rdr) + http.ServeContent(w, &r.Request, "", time.Now(), reader) } func (s *Server) ServeHTTP(rw http.ResponseWriter, r *http.Request) {