opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-17 18:50:48 +08:00
Code Issues Projects Releases Wiki Activity

some commenting

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2015-07-26 11:28:53 -07:00
parent fd75b64630
commit 1ce310be8b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
commands/http/client.go
View File

@ -242,6 +242,8 @@ func getResponse(httpRes *http.Response, req cmds.Request) (cmds.Response, error
return res, nil return res, nil
} }
// read json objects off of the given stream, and write the objects out to
// the 'out' channel
func readStreamedJson(req cmds.Request, httpRes *http.Response, out chan<- interface{}) { func readStreamedJson(req cmds.Request, httpRes *http.Response, out chan<- interface{}) {
defer close(out) defer close(out)
dec := json.NewDecoder(&httpResponseReader{httpRes}) dec := json.NewDecoder(&httpResponseReader{httpRes})
@ -270,6 +272,8 @@ func readStreamedJson(req cmds.Request, httpRes *http.Response, out chan<- inter
} }
} }
// decode a value of the given type, if the type is nil, attempt to decode into
// an interface{} anyways
func decodeTypedVal(t reflect.Type, dec *json.Decoder) (interface{}, error) { func decodeTypedVal(t reflect.Type, dec *json.Decoder) (interface{}, error) {
var v interface{} var v interface{}
var err error var err error
@ -283,6 +287,9 @@ func decodeTypedVal(t reflect.Type, dec *json.Decoder) (interface{}, error) {
return v, err return v, err
} }
// httpResponseReader reads from the response body, and checks for an error
// in the http trailer upon EOF, this error if present is returned instead
// of the EOF.
type httpResponseReader struct { type httpResponseReader struct {
resp *http.Response resp *http.Response
} }

2
commands/http/handler.go
View File

@ -193,6 +193,7 @@ func sendResponse(w http.ResponseWriter, req cmds.Request, res cmds.Response) {
mime = applicationJson mime = applicationJson
} }
} }
if mime != "" { if mime != "" {
h.Set(contentTypeHeader, mime) h.Set(contentTypeHeader, mime)
} }
@ -207,6 +208,7 @@ func sendResponse(w http.ResponseWriter, req cmds.Request, res cmds.Response) {
// Copies from an io.Reader to a http.ResponseWriter. // Copies from an io.Reader to a http.ResponseWriter.
// Flushes chunks over HTTP stream as they are read (if supported by transport). // Flushes chunks over HTTP stream as they are read (if supported by transport).
func copyChunks(status int, w http.ResponseWriter, out io.Reader) error { func copyChunks(status int, w http.ResponseWriter, out io.Reader) error {
// hijack the connection so we can write our own chunked output and trailers
hijacker, ok := w.(http.Hijacker) hijacker, ok := w.(http.Hijacker)
if !ok { if !ok {
log.Error("Failed to create hijacker! cannot continue!") log.Error("Failed to create hijacker! cannot continue!")