提交 8d6ac7a8 作者: Jeromy Johnson 提交者: GitHub

Merge pull request #3366 from keks/fix/fix-adding

Revert "http api: makes sure header is sent even when r is not ready …
...@@ -288,7 +288,6 @@ func sendResponse(w http.ResponseWriter, r *http.Request, res cmds.Response, req ...@@ -288,7 +288,6 @@ func sendResponse(w http.ResponseWriter, r *http.Request, res cmds.Response, req
log.Error("err: ", err) log.Error("err: ", err)
w.Header().Set(StreamErrHeader, sanitizedErrStr(err)) w.Header().Set(StreamErrHeader, sanitizedErrStr(err))
} }
} }
func flushCopy(w io.Writer, r io.Reader) error { func flushCopy(w io.Writer, r io.Reader) error {
...@@ -299,9 +298,6 @@ func flushCopy(w io.Writer, r io.Reader) error { ...@@ -299,9 +298,6 @@ func flushCopy(w io.Writer, r io.Reader) error {
return err return err
} }
for { for {
// flush to send header when r is not ready yet
f.Flush()
n, err := r.Read(buf) n, err := r.Read(buf)
switch err { switch err {
case io.EOF: case io.EOF:
...@@ -324,6 +320,8 @@ func flushCopy(w io.Writer, r io.Reader) error { ...@@ -324,6 +320,8 @@ func flushCopy(w io.Writer, r io.Reader) error {
if nw != n { if nw != n {
return fmt.Errorf("http write failed to write full amount: %d != %d", nw, n) return fmt.Errorf("http write failed to write full amount: %d != %d", nw, n)
} }
f.Flush()
} }
return nil return nil
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论