Revert "fix memory leak with authorization plugins"

runcom · runcom · commit 7e1d789a0ff9 · 2018-08-27T16:18:44.000+02:00
This reverts commit aacbc4b.
diff --git a/api/server/router/container/copy.go b/api/server/router/container/copy.go
@@ -12,8 +12,6 @@ import (
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/pools"
 	"golang.org/x/net/context"
 )
 
@@ -105,9 +103,7 @@ func (s *containerRouter) getContainersArchive(ctx context.Context, w http.Respo
 	}
 
 	w.Header().Set("Content-Type", "application/x-tar")
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-	_, err = pools.Copy(output, tarArchive)
+	_, err = io.Copy(w, tarArchive)
 
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ import (`
`12`	`12`	`"github.com/docker/docker/api/server/httputils"`
`13`	`13`	`"github.com/docker/docker/api/types"`
`14`	`14`	`"github.com/docker/docker/api/types/versions"`
`15`		`- "github.com/docker/docker/pkg/ioutils"`
`16`		`- "github.com/docker/docker/pkg/pools"`
`17`	`15`	`"golang.org/x/net/context"`
`18`	`16`	`)`
`19`	`17`
`@@ -105,9 +103,7 @@ func (s *containerRouter) getContainersArchive(ctx context.Context, w http.Respo`
`105`	`103`	`}`
`106`	`104`
`107`	`105`	`w.Header().Set("Content-Type", "application/x-tar")`
`108`		`- output := ioutils.NewWriteFlusher(w)`
`109`		`- defer output.Close()`
`110`		`- _, err = pools.Copy(output, tarArchive)`
	`106`	`+ _, err = io.Copy(w, tarArchive)`
`111`	`107`
`112`	`108`	`return err`
`113`	`109`	`}`