centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 08:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use ioutil.NopCloser to make copy of http.request.Body.

Browse Source 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
This commit is contained in:
Dong Chen
2015-11-23 15:03:30 -08:00
parent 22ff794c2e
commit 10986a6038
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/handlers.go
View File

@@ -24,16 +24,6 @@ import (
// APIVERSION is the API version supported by swarm manager
const APIVERSION = "1.21"
// A simple buffer reader to copy http.Request.Body stream
type bufReader struct {
*bytes.Buffer
}
// Implements io.ReadCloser interface
func (bf bufReader) Close() error {
return nil
}
// GET /info
func getInfo(c *context, w http.ResponseWriter, r *http.Request) {
info := dockerclient.Info{
@@ -809,13 +799,14 @@ func proxyNetworkContainerOperation(c *context, w http.ResponseWriter, r *http.R
// make a copy of r.Body
buf, _ := ioutil.ReadAll(r.Body)
copy1 := bufReader{bytes.NewBuffer(buf)}
// restore r.Body
r.Body = bufReader{bytes.NewBuffer(buf)}
bodyCopy := ioutil.NopCloser(bytes.NewBuffer(buf))
defer bodyCopy.Close()
// restore r.Body stream as it'll be read again
r.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
// Extract container info from r.Body copy
var connect dockerclient.NetworkConnect
if err := json.NewDecoder(copy1).Decode(&connect); err != nil {
if err := json.NewDecoder(bodyCopy).Decode(&connect); err != nil {
httpError(w, fmt.Sprintf("Container is not specified"), http.StatusNotFound)
return
}