revert commit breaking ipfs add for js-ipfs-api
Revert "http api: makes sure header is sent even when r is not ready yet. fixes #3304 (#3305)" This reverts commit 68d8a298c58ed950bd44118cc5e6d1ffc2def395. License: MIT Signed-off-by: Jan Winkelmann <j-winkelmann@tuhh.de>
Jan Winkelmann committed
Nov 7, 2016 at 20:34 UTC
c6186982e8ee74ceaa66d714e666584e4ef7eb67
1 file changed
+2
-4
commands/http/handler.go
+2
-4
@@ -288,7 +288,6 @@ func sendResponse(w http.ResponseWriter, r *http.Request, res cmds.Response, req
288
log.Error("err: ", err)
289
w.Header().Set(StreamErrHeader, sanitizedErrStr(err))
290
}
291
-
291
}
292
293
func flushCopy(w io.Writer, r io.Reader) error {
@@ -299,9 +298,6 @@ func flushCopy(w io.Writer, r io.Reader) error {
298
return err
299
}
300
for {
302
- // flush to send header when r is not ready yet
303
- f.Flush()
304
-
301
n, err := r.Read(buf)
302
switch err {
303
case io.EOF:
@@ -324,6 +320,8 @@ func flushCopy(w io.Writer, r io.Reader) error {
320
if nw != n {
321
return fmt.Errorf("http write failed to write full amount: %d != %d", nw, n)
322
}
323
+
324
+ f.Flush()
325
}
326
return nil
327
}