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

swarm/api: comment out ioutil.ReadAll

Browse source
This commit is contained in:
Anton Evangelatov 2018-04-22 15:18:53 +02:00
parent b68c2d35d8
commit 2b5c0d0820
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/swarm/swarm-smoke/upload_and_sync.go
View file

@ -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

20
swarm/api/http/server.go
View file

@ -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) {