opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 01:52:26 +08:00
Code Issues Projects Releases Wiki Activity

only set stream header on streamed output

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2015-07-28 08:18:31 -07:00
parent 075e68782c
commit 2cad99d5ef
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
commands/http/handler.go
View File

@ -133,14 +133,6 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
func guessMimeType(res cmds.Response) (string, error) { func guessMimeType(res cmds.Response) (string, error) {
if _, ok := res.Output().(io.Reader); ok {
// we don't set the Content-Type for streams, so that browsers can MIME-sniff the type themselves
// we set this header so clients have a way to know this is an output stream
// (not marshalled command output)
// TODO: set a specific Content-Type if the command response needs it to be a certain type
return "", nil
}
// Try to guess mimeType from the encoding option // Try to guess mimeType from the encoding option
enc, found, err := res.Request().Option(cmds.EncShort).String() enc, found, err := res.Request().Option(cmds.EncShort).String()
if err != nil { if err != nil {
@ -182,6 +174,11 @@ func sendResponse(w http.ResponseWriter, req cmds.Request, res cmds.Response) {
h.Set(contentLengthHeader, strconv.FormatUint(res.Length(), 10)) h.Set(contentLengthHeader, strconv.FormatUint(res.Length(), 10))
} }
if _, ok := res.Output().(io.Reader); ok {
mime = ""
h.Set(streamHeader, "1")
}
// if output is a channel and user requested streaming channels, // if output is a channel and user requested streaming channels,
// use chunk copier for the output // use chunk copier for the output
_, isChan := res.Output().(chan interface{}) _, isChan := res.Output().(chan interface{})
@ -201,7 +198,6 @@ func sendResponse(w http.ResponseWriter, req cmds.Request, res cmds.Response) {
if mime != "" { if mime != "" {
h.Set(contentTypeHeader, mime) h.Set(contentTypeHeader, mime)
} }
h.Set(streamHeader, "1")
h.Set(transferEncodingHeader, "chunked") h.Set(transferEncodingHeader, "chunked")
if err := writeResponse(status, w, out); err != nil { if err := writeResponse(status, w, out); err != nil {