@@ -2,15 +2,11 @@ package daemon

 import (

 	"bytes"

-	"crypto/tls"

 	"encoding/json"

 	"fmt"

 	"io"

 	"io/ioutil"

-	"net"

 	"net/http"

-	"net/http/httputil"

-	"net/url"

 	"os"

 	"os/exec"

 	"path/filepath"

@@ -20,6 +16,7 @@ import (

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/stringid"

@@ -624,7 +621,7 @@ func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, []

 // SockRequestRaw executes a socket request on a daemon and returns an http

 // response and a reader for the output data.

 func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) {

-	return SockRequestRawToDaemon(method, endpoint, data, ct, d.Sock())

+	return request.SockRequestRaw(method, endpoint, data, ct, d.Sock())

 }

 // LogFileName returns the path the daemon's log file

@@ -714,7 +711,7 @@ func (d *Daemon) ReloadConfig() error {

 	errCh := make(chan error)

 	started := make(chan struct{})

 	go func() {

-		_, body, err := SockRequestRawToDaemon("GET", "/events", nil, "", d.Sock())

+		_, body, err := request.SockRequestRaw("GET", "/events", nil, "", d.Sock())

 		close(started)

 		if err != nil {

 			errCh <- err

@@ -791,96 +788,6 @@ func WaitInspectWithArgs(dockerBinary, name, expr, expected string, timeout time

 	return nil

 }

-// SockRequestRawToDaemon creates an http request against the specified daemon socket

-// FIXME(vdemeester) attach this to daemon ?

-func SockRequestRawToDaemon(method, endpoint string, data io.Reader, ct, daemon string) (*http.Response, io.ReadCloser, error) {

-	req, client, err := newRequestClient(method, endpoint, data, ct, daemon)

-	if err != nil {

-		return nil, nil, err

-	}

-

-	resp, err := client.Do(req)

-	if err != nil {

-		client.Close()

-		return nil, nil, err

-	}

-	body := ioutils.NewReadCloserWrapper(resp.Body, func() error {

-		defer resp.Body.Close()

-		return client.Close()

-	})

-

-	return resp, body, nil

-}

-

-func getTLSConfig() (*tls.Config, error) {

-	dockerCertPath := os.Getenv("DOCKER_CERT_PATH")

-

-	if dockerCertPath == "" {

-		return nil, errors.New("DOCKER_TLS_VERIFY specified, but no DOCKER_CERT_PATH environment variable")

-	}

-

-	option := &tlsconfig.Options{

-		CAFile:   filepath.Join(dockerCertPath, "ca.pem"),

-		CertFile: filepath.Join(dockerCertPath, "cert.pem"),

-		KeyFile:  filepath.Join(dockerCertPath, "key.pem"),

-	}

-	tlsConfig, err := tlsconfig.Client(*option)

-	if err != nil {

-		return nil, err

-	}

-

-	return tlsConfig, nil

-}

-

-// SockConn opens a connection on the specified socket

-func SockConn(timeout time.Duration, daemon string) (net.Conn, error) {

-	daemonURL, err := url.Parse(daemon)

-	if err != nil {

-		return nil, errors.Wrapf(err, "could not parse url %q", daemon)

-	}

-

-	var c net.Conn

-	switch daemonURL.Scheme {

-	case "npipe":

-		return npipeDial(daemonURL.Path, timeout)

-	case "unix":

-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Path, timeout)

-	case "tcp":

-		if os.Getenv("DOCKER_TLS_VERIFY") != "" {

-			// Setup the socket TLS configuration.

-			tlsConfig, err := getTLSConfig()

-			if err != nil {

-				return nil, err

-			}

-			dialer := &net.Dialer{Timeout: timeout}

-			return tls.DialWithDialer(dialer, daemonURL.Scheme, daemonURL.Host, tlsConfig)

-		}

-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Host, timeout)

-	default:

-		return c, errors.Errorf("unknown scheme %v (%s)", daemonURL.Scheme, daemon)

-	}

-}

-

-func newRequestClient(method, endpoint string, data io.Reader, ct, daemon string) (*http.Request, *httputil.ClientConn, error) {

-	c, err := SockConn(time.Duration(10*time.Second), daemon)

-	if err != nil {

-		return nil, nil, errors.Errorf("could not dial docker daemon: %v", err)

-	}

-

-	client := httputil.NewClientConn(c, nil)

-

-	req, err := http.NewRequest(method, endpoint, data)

-	if err != nil {

-		client.Close()

-		return nil, nil, errors.Errorf("could not create new request: %v", err)

-	}

-

-	if ct != "" {

-		req.Header.Set("Content-Type", ct)

-	}

-	return req, client, nil

-}

-

 // BuildImageCmdWithHost create a build command with the specified arguments.

 // FIXME(vdemeester) move this away

 func BuildImageCmdWithHost(dockerBinary, name, dockerfile, host string, useCache bool, buildFlags ...string) *exec.Cmd {

deleted file mode 100644

@@ -1,12 +0,0 @@

-// +build !windows

-

-package daemon

-

-import (

-	"net"

-	"time"

-)

-

-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {

-	panic("npipe protocol only supported on Windows")

-}

deleted file mode 100644

@@ -1,12 +0,0 @@

-package daemon

-

-import (

-	"net"

-	"time"

-

-	"github.com/Microsoft/go-winio"

-)

-

-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {

-	return winio.DialPipe(path, &timeout)

-}

@@ -13,6 +13,7 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/docker/docker/pkg/testutil"

 	"github.com/go-check/check"

@@ -23,7 +24,7 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	out, _ := dockerCmd(c, "run", "-dit", "busybox", "cat")

-	rwc, err := sockConn(time.Duration(10*time.Second), "")

+	rwc, err := request.SockConn(time.Duration(10*time.Second), daemonHost())

 	c.Assert(err, checker.IsNil)

 	cleanedContainerID := strings.TrimSpace(out)

@@ -73,22 +74,20 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {

 // regression gh14320

 func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) {

-	req, client, err := newRequestClient("POST", "/containers/doesnotexist/attach", nil, "", "")

+	client, err := request.NewClient(daemonHost())

 	c.Assert(err, checker.IsNil)

-

+	req, err := request.New(daemonHost(), "/containers/doesnotexist/attach", request.Method(http.MethodPost))

 	resp, err := client.Do(req)

 	// connection will shutdown, err should be "persistent connection closed"

-	c.Assert(err, checker.NotNil) // Server shutdown connection

-

-	body, err := testutil.ReadBody(resp.Body)

-	c.Assert(err, checker.IsNil)

 	c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)

+	content, err := testutil.ReadBody(resp.Body)

+	c.Assert(err, checker.IsNil)

 	expected := "No such container: doesnotexist\r\n"

-	c.Assert(string(body), checker.Equals, expected)

+	c.Assert(string(content), checker.Equals, expected)

 }

 func (s *DockerSuite) TestGetContainersWsAttachContainerNotFound(c *check.C) {

-	status, body, err := sockRequest("GET", "/containers/doesnotexist/attach/ws", nil)

+	status, body, err := request.SockRequest("GET", "/containers/doesnotexist/attach/ws", nil, daemonHost())

 	c.Assert(status, checker.Equals, http.StatusNotFound)

 	c.Assert(err, checker.IsNil)

 	expected := "No such container: doesnotexist"

@@ -140,12 +139,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {

 	cid, _ := dockerCmd(c, "run", "-di", "busybox", "cat")

 	cid = strings.TrimSpace(cid)

 	// Attach to the container's stdout stream.

-	conn, br, err := sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")

+	conn, br, err := request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	// Check if the data from stdout can be received.

 	expectSuccess(conn, br, "stdout", false)

 	// Attach to the container's stderr stream.

-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")

+	conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	// Since the container only emits stdout, attaching to stderr should return nothing.

 	expectTimeout(conn, br, "stdout")

@@ -153,10 +152,10 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {

 	// Test the similar functions of the stderr stream.

 	cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "cat >&2")

 	cid = strings.TrimSpace(cid)

-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")

+	conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	expectSuccess(conn, br, "stderr", false)

-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")

+	conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	expectTimeout(conn, br, "stderr")

@@ -164,12 +163,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {

 	cid, _ = dockerCmd(c, "run", "-dit", "busybox", "/bin/sh", "-c", "cat >&2")

 	cid = strings.TrimSpace(cid)

 	// Attach to stdout only.

-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")

+	conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	expectSuccess(conn, br, "stdout", true)

 	// Attach without stdout stream.

-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")

+	conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())

 	c.Assert(err, checker.IsNil)

 	// Nothing should be received because both the stdout and stderr of the container will be

 	// sent to the client as stdout when tty is enabled.

@@ -5,6 +5,7 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/go-check/check"

 )

@@ -17,7 +18,7 @@ func (s *DockerSuite) TestAuthAPI(c *check.C) {

 	}

 	expected := "Get https://registry-1.docker.io/v2/: unauthorized: incorrect username or password"

-	status, body, err := sockRequest("POST", "/auth", config)

+	status, body, err := request.SockRequest("POST", "/auth", config, daemonHost())

 	c.Assert(err, check.IsNil)

 	c.Assert(status, check.Equals, http.StatusUnauthorized)

 	msg := getErrorMessage(c, body)

@@ -8,6 +8,7 @@ import (

 	"strings"

 	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/pkg/testutil"

 	"github.com/go-check/check"

 )

@@ -31,7 +32,7 @@ RUN find /tmp/`

 	c.Assert(err, checker.IsNil)

 	defer server.Close()

-	res, body, err := sockRequestRaw("POST", "/build?dockerfile=baz&remote="+server.URL()+"/testD", nil, "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/build?dockerfile=baz&remote="+server.URL()+"/testD", nil, "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -72,7 +73,7 @@ func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) {

 	defer server.Close()

-	res, b, err := sockRequestRaw("POST", "/build?remote="+server.URL()+"/testT.tar", nil, "application/tar")

+	res, b, err := request.SockRequestRaw("POST", "/build?remote="+server.URL()+"/testT.tar", nil, "application/tar", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

 	b.Close()

@@ -121,7 +122,7 @@ RUN echo 'right'

 	defer server.Close()

 	url := "/build?dockerfile=custom&remote=" + server.URL() + "/testT.tar"

-	res, body, err := sockRequestRaw("POST", url, nil, "application/tar")

+	res, body, err := request.SockRequestRaw("POST", url, nil, "application/tar", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -141,7 +142,7 @@ RUN echo from dockerfile`,

 	c.Assert(err, checker.IsNil)

 	defer git.Close()

-	res, body, err := sockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -163,7 +164,7 @@ RUN echo from Dockerfile`,

 	defer git.Close()

 	// Make sure it tries to 'dockerfile' query param value

-	res, body, err := sockRequestRaw("POST", "/build?dockerfile=baz&remote="+git.RepoURL, nil, "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/build?dockerfile=baz&remote="+git.RepoURL, nil, "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -186,7 +187,7 @@ RUN echo from dockerfile`,

 	defer git.Close()

 	// Make sure it tries to 'dockerfile' query param value

-	res, body, err := sockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -233,7 +234,7 @@ func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) {

 		// failed to close tar archive

 		c.Assert(tw.Close(), checker.IsNil)

-		res, body, err := sockRequestRaw("POST", "/build", buffer, "application/x-tar")

+		res, body, err := request.SockRequestRaw("POST", "/build", buffer, "application/x-tar", daemonHost())

 		c.Assert(err, checker.IsNil)

 		c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

@@ -8,7 +8,6 @@ import (

 	"io"

 	"io/ioutil"

 	"net/http"

-	"net/http/httputil"

 	"net/url"

 	"os"

 	"path/filepath"

@@ -22,6 +21,7 @@ import (

 	mounttypes "github.com/docker/docker/api/types/mount"

 	networktypes "github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/pkg/stringid"

@@ -37,7 +37,7 @@ func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {

 	name := "getall"

 	dockerCmd(c, "run", "--name", name, "busybox", "true")

-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)

+	status, body, err := request.SockRequest("GET", "/containers/json?all=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -57,7 +57,7 @@ func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {

 func (s *DockerSuite) TestContainerAPIGetJSONNoFieldsOmitted(c *check.C) {

 	dockerCmd(c, "run", "busybox", "true")

-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)

+	status, body, err := request.SockRequest("GET", "/containers/json?all=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -98,7 +98,7 @@ func (s *DockerSuite) TestContainerAPIPsOmitFields(c *check.C) {

 	port := 80

 	runSleepingContainer(c, "--name", name, "--expose", strconv.Itoa(port))

-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)

+	status, body, err := request.SockRequest("GET", "/containers/json?all=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -130,7 +130,7 @@ func (s *DockerSuite) TestContainerAPIGetExport(c *check.C) {

 	name := "exportcontainer"

 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test")

-	status, body, err := sockRequest("GET", "/containers/"+name+"/export", nil)

+	status, body, err := request.SockRequest("GET", "/containers/"+name+"/export", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -154,7 +154,7 @@ func (s *DockerSuite) TestContainerAPIGetChanges(c *check.C) {

 	name := "changescontainer"

 	dockerCmd(c, "run", "--name", name, "busybox", "rm", "/etc/passwd")

-	status, body, err := sockRequest("GET", "/containers/"+name+"/changes", nil)

+	status, body, err := request.SockRequest("GET", "/containers/"+name+"/changes", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -187,7 +187,7 @@ func (s *DockerSuite) TestGetContainerStats(c *check.C) {

 	}

 	bc := make(chan b, 1)

 	go func() {

-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats", nil)

+		status, body, err := request.SockRequest("GET", "/containers/"+name+"/stats", nil, daemonHost())

 		bc <- b{status, body, err}

 	}()

@@ -218,7 +218,7 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {

 	buf := &testutil.ChannelBuffer{make(chan []byte, 1)}

 	defer buf.Close()

-	_, body, err := sockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json")

+	_, body, err := request.SockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	defer body.Close()

@@ -257,7 +257,7 @@ func (s *DockerSuite) TestGetContainerStatsStream(c *check.C) {

 	}

 	bc := make(chan b, 1)

 	go func() {

-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats", nil)

+		status, body, err := request.SockRequest("GET", "/containers/"+name+"/stats", nil, daemonHost())

 		bc <- b{status, body, err}

 	}()

@@ -293,7 +293,7 @@ func (s *DockerSuite) TestGetContainerStatsNoStream(c *check.C) {

 	}

 	bc := make(chan b, 1)

 	go func() {

-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats?stream=0", nil)

+		status, body, err := request.SockRequest("GET", "/containers/"+name+"/stats?stream=0", nil, daemonHost())

 		bc <- b{status, body, err}

 	}()

@@ -329,7 +329,7 @@ func (s *DockerSuite) TestGetStoppedContainerStats(c *check.C) {

 	// We expect an immediate response, but if it's not immediate, the test would hang, so put it in a goroutine

 	// below we'll check this on a timeout.

 	go func() {

-		resp, body, err := sockRequestRaw("GET", "/containers/"+name+"/stats", nil, "")

+		resp, body, err := request.SockRequestRaw("GET", "/containers/"+name+"/stats", nil, "", daemonHost())

 		body.Close()

 		chResp <- stats{resp.StatusCode, err}

 	}()

@@ -350,7 +350,7 @@ func (s *DockerSuite) TestContainerAPIPause(c *check.C) {

 	out, _ := dockerCmd(c, "run", "-d", "busybox", "sleep", "30")

 	ContainerID := strings.TrimSpace(out)

-	status, _, err := sockRequest("POST", "/containers/"+ContainerID+"/pause", nil)

+	status, _, err := request.SockRequest("POST", "/containers/"+ContainerID+"/pause", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

@@ -361,7 +361,7 @@ func (s *DockerSuite) TestContainerAPIPause(c *check.C) {

 		c.Fatalf("there should be one paused container and not %d", len(pausedContainers))

 	}

-	status, _, err = sockRequest("POST", "/containers/"+ContainerID+"/unpause", nil)

+	status, _, err = request.SockRequest("POST", "/containers/"+ContainerID+"/unpause", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

@@ -381,7 +381,7 @@ func (s *DockerSuite) TestContainerAPITop(c *check.C) {

 		Processes [][]string

 	}

 	var top topResp

-	status, b, err := sockRequest("GET", "/containers/"+id+"/top?ps_args=aux", nil)

+	status, b, err := request.SockRequest("GET", "/containers/"+id+"/top?ps_args=aux", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

 	c.Assert(json.Unmarshal(b, &top), checker.IsNil)

@@ -406,7 +406,7 @@ func (s *DockerSuite) TestContainerAPITopWindows(c *check.C) {

 		Processes [][]string

 	}

 	var top topResp

-	status, b, err := sockRequest("GET", "/containers/"+id+"/top", nil)

+	status, b, err := request.SockRequest("GET", "/containers/"+id+"/top", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

 	c.Assert(json.Unmarshal(b, &top), checker.IsNil)

@@ -434,7 +434,7 @@ func (s *DockerSuite) TestContainerAPICommit(c *check.C) {

 	dockerCmd(c, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test")

 	name := "testcontainerapicommit"

-	status, b, err := sockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+cName, nil)

+	status, b, err := request.SockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+cName, nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

@@ -460,7 +460,7 @@ func (s *DockerSuite) TestContainerAPICommitWithLabelInConfig(c *check.C) {

 	}

 	name := "testcontainerapicommitwithconfig"

-	status, b, err := sockRequest("POST", "/commit?repo="+name+"&container="+cName, config)

+	status, b, err := request.SockRequest("POST", "/commit?repo="+name+"&container="+cName, config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

@@ -502,7 +502,7 @@ func (s *DockerSuite) TestContainerAPIBadPort(c *check.C) {

 	jsonData := bytes.NewBuffer(nil)

 	json.NewEncoder(jsonData).Encode(config)

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusInternalServerError)

 	c.Assert(getErrorMessage(c, body), checker.Equals, `invalid port specification: "aa80"`, check.Commentf("Incorrect error msg: %s", body))

@@ -514,7 +514,7 @@ func (s *DockerSuite) TestContainerAPICreate(c *check.C) {

 		"Cmd":   []string{"/bin/sh", "-c", "touch /test && ls /test"},

 	}

-	status, b, err := sockRequest("POST", "/containers/create", config)

+	status, b, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

@@ -531,7 +531,7 @@ func (s *DockerSuite) TestContainerAPICreate(c *check.C) {

 func (s *DockerSuite) TestContainerAPICreateEmptyConfig(c *check.C) {

 	config := map[string]interface{}{}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusInternalServerError)

@@ -552,7 +552,7 @@ func (s *DockerSuite) TestContainerAPICreateMultipleNetworksConfig(c *check.C) {

 		},

 	}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusBadRequest)

 	msg := getErrorMessage(c, body)

@@ -570,14 +570,14 @@ func (s *DockerSuite) TestContainerAPICreateWithHostName(c *check.C) {

 		"Hostname": hostName,

 	}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

 	var container containertypes.ContainerCreateCreatedBody

 	c.Assert(json.Unmarshal(body, &container), checker.IsNil)

-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)

+	status, body, err = request.SockRequest("GET", "/containers/"+container.ID+"/json", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -593,14 +593,14 @@ func (s *DockerSuite) TestContainerAPICreateWithDomainName(c *check.C) {

 		"Domainname": domainName,

 	}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

 	var container containertypes.ContainerCreateCreatedBody

 	c.Assert(json.Unmarshal(body, &container), checker.IsNil)

-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)

+	status, body, err = request.SockRequest("GET", "/containers/"+container.ID+"/json", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -628,14 +628,14 @@ func UtilCreateNetworkMode(c *check.C, networkMode string) {

 		"HostConfig": map[string]interface{}{"NetworkMode": networkMode},

 	}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

 	var container containertypes.ContainerCreateCreatedBody

 	c.Assert(json.Unmarshal(body, &container), checker.IsNil)

-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)

+	status, body, err = request.SockRequest("GET", "/containers/"+container.ID+"/json", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -653,14 +653,14 @@ func (s *DockerSuite) TestContainerAPICreateWithCpuSharesCpuset(c *check.C) {

 		"CpusetCpus": "0",

 	}

-	status, body, err := sockRequest("POST", "/containers/create", config)

+	status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

 	var container containertypes.ContainerCreateCreatedBody

 	c.Assert(json.Unmarshal(body, &container), checker.IsNil)

-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)

+	status, body, err = request.SockRequest("GET", "/containers/"+container.ID+"/json", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -683,7 +683,7 @@ func (s *DockerSuite) TestContainerAPIVerifyHeader(c *check.C) {

 	create := func(ct string) (*http.Response, io.ReadCloser, error) {

 		jsonData := bytes.NewBuffer(nil)

 		c.Assert(json.NewEncoder(jsonData).Encode(config), checker.IsNil)

-		return sockRequestRaw("POST", "/containers/create", jsonData, ct)

+		return request.SockRequestRaw("POST", "/containers/create", jsonData, ct, daemonHost())

 	}

 	// Try with no content-type

@@ -719,7 +719,7 @@ func (s *DockerSuite) TestContainerAPIInvalidPortSyntax(c *check.C) {

 				  }

 				}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)

@@ -739,7 +739,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyInvalidPolicyName(c *check.C)

 		}

 	}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)

@@ -759,7 +759,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyRetryMismatch(c *check.C) {

 		}

 	}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)

@@ -779,7 +779,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyNegativeRetryCount(c *check.C

 		}

 	}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)

@@ -799,7 +799,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyDefaultRetryCount(c *check.C)

 		}

 	}`

-	res, _, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, _, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)

 }

@@ -830,7 +830,7 @@ func (s *DockerSuite) TestContainerAPIPostCreateNull(c *check.C) {

 		"NetworkDisabled":false,

 		"OnBuild":null}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)

@@ -861,7 +861,7 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {

 		"Memory":    524287

 	}`

-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")

+	res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())

 	c.Assert(err, checker.IsNil)

 	b, err2 := testutil.ReadBody(body)

 	c.Assert(err2, checker.IsNil)

@@ -875,7 +875,7 @@ func (s *DockerSuite) TestContainerAPIRename(c *check.C) {

 	containerID := strings.TrimSpace(out)

 	newName := "TestContainerAPIRenameNew"

-	statusCode, _, err := sockRequest("POST", "/containers/"+containerID+"/rename?name="+newName, nil)

+	statusCode, _, err := request.SockRequest("POST", "/containers/"+containerID+"/rename?name="+newName, nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	// 204 No Content is expected, not 200

 	c.Assert(statusCode, checker.Equals, http.StatusNoContent)

@@ -888,7 +888,7 @@ func (s *DockerSuite) TestContainerAPIKill(c *check.C) {

 	name := "test-api-kill"

 	runSleepingContainer(c, "-i", "--name", name)

-	status, _, err := sockRequest("POST", "/containers/"+name+"/kill", nil)

+	status, _, err := request.SockRequest("POST", "/containers/"+name+"/kill", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

@@ -900,7 +900,7 @@ func (s *DockerSuite) TestContainerAPIRestart(c *check.C) {

 	name := "test-api-restart"

 	runSleepingContainer(c, "-di", "--name", name)

-	status, _, err := sockRequest("POST", "/containers/"+name+"/restart?t=1", nil)

+	status, _, err := request.SockRequest("POST", "/containers/"+name+"/restart?t=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 15*time.Second), checker.IsNil)

@@ -912,7 +912,7 @@ func (s *DockerSuite) TestContainerAPIRestartNotimeoutParam(c *check.C) {

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

-	status, _, err := sockRequest("POST", "/containers/"+name+"/restart", nil)

+	status, _, err := request.SockRequest("POST", "/containers/"+name+"/restart", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 15*time.Second), checker.IsNil)

@@ -926,16 +926,16 @@ func (s *DockerSuite) TestContainerAPIStart(c *check.C) {

 		"OpenStdin": true,

 	}

-	status, _, err := sockRequest("POST", "/containers/create?name="+name, config)

+	status, _, err := request.SockRequest("POST", "/containers/create?name="+name, config, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusCreated)

-	status, _, err = sockRequest("POST", "/containers/"+name+"/start", nil)

+	status, _, err = request.SockRequest("POST", "/containers/"+name+"/start", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 	// second call to start should give 304

-	status, _, err = sockRequest("POST", "/containers/"+name+"/start", nil)

+	status, _, err = request.SockRequest("POST", "/containers/"+name+"/start", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	// TODO(tibor): figure out why this doesn't work on windows

@@ -948,13 +948,13 @@ func (s *DockerSuite) TestContainerAPIStop(c *check.C) {

 	name := "test-api-stop"

 	runSleepingContainer(c, "-i", "--name", name)

-	status, _, err := sockRequest("POST", "/containers/"+name+"/stop?t=30", nil)

+	status, _, err := request.SockRequest("POST", "/containers/"+name+"/stop?t=30", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 	c.Assert(waitInspect(name, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)

 	// second call to start should give 304

-	status, _, err = sockRequest("POST", "/containers/"+name+"/stop?t=30", nil)

+	status, _, err = request.SockRequest("POST", "/containers/"+name+"/stop?t=30", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNotModified)

 }

@@ -968,7 +968,7 @@ func (s *DockerSuite) TestContainerAPIWait(c *check.C) {

 	}

 	dockerCmd(c, "run", "--name", name, "busybox", sleepCmd, "2")

-	status, body, err := sockRequest("POST", "/containers/"+name+"/wait", nil)

+	status, body, err := request.SockRequest("POST", "/containers/"+name+"/wait", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

 	c.Assert(waitInspect(name, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)

@@ -986,7 +986,7 @@ func (s *DockerSuite) TestContainerAPICopyNotExistsAnyMore(c *check.C) {

 		Resource: "/test.txt",

 	}

-	status, _, err := sockRequest("POST", "/containers/"+name+"/copy", postData)

+	status, _, err := request.SockRequest("POST", "/containers/"+name+"/copy", postData, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNotFound)

 }

@@ -1000,7 +1000,7 @@ func (s *DockerSuite) TestContainerAPICopyPre124(c *check.C) {

 		Resource: "/test.txt",

 	}

-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)

+	status, body, err := request.SockRequest("POST", "/v1.23/containers/"+name+"/copy", postData, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusOK)

@@ -1030,7 +1030,7 @@ func (s *DockerSuite) TestContainerAPICopyResourcePathEmptyPr124(c *check.C) {

 		Resource: "",

 	}

-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)

+	status, body, err := request.SockRequest("POST", "/v1.23/containers/"+name+"/copy", postData, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusInternalServerError)

 	c.Assert(string(body), checker.Matches, "Path cannot be empty\n")

@@ -1045,7 +1045,7 @@ func (s *DockerSuite) TestContainerAPICopyResourcePathNotFoundPre124(c *check.C)

 		Resource: "/notexist",

 	}

-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)

+	status, body, err := request.SockRequest("POST", "/v1.23/containers/"+name+"/copy", postData, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusInternalServerError)

 	c.Assert(string(body), checker.Matches, "Could not find the file /notexist in container "+name+"\n")

@@ -1057,7 +1057,7 @@ func (s *DockerSuite) TestContainerAPICopyContainerNotFoundPr124(c *check.C) {

 		Resource: "/something",

 	}

-	status, _, err := sockRequest("POST", "/v1.23/containers/notexists/copy", postData)

+	status, _, err := request.SockRequest("POST", "/v1.23/containers/notexists/copy", postData, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNotFound)

 }

@@ -1070,13 +1070,13 @@ func (s *DockerSuite) TestContainerAPIDelete(c *check.C) {

 	dockerCmd(c, "stop", id)

-	status, _, err := sockRequest("DELETE", "/containers/"+id, nil)

+	status, _, err := request.SockRequest("DELETE", "/containers/"+id, nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 }

 func (s *DockerSuite) TestContainerAPIDeleteNotExist(c *check.C) {

-	status, body, err := sockRequest("DELETE", "/containers/doesnotexist", nil)

+	status, body, err := request.SockRequest("DELETE", "/containers/doesnotexist", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNotFound)

 	c.Assert(getErrorMessage(c, body), checker.Matches, "No such container: doesnotexist")

@@ -1088,7 +1088,7 @@ func (s *DockerSuite) TestContainerAPIDeleteForce(c *check.C) {

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

-	status, _, err := sockRequest("DELETE", "/containers/"+id+"?force=1", nil)

+	status, _, err := request.SockRequest("DELETE", "/containers/"+id+"?force=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 }

@@ -1109,7 +1109,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveLinks(c *check.C) {

 	links := inspectFieldJSON(c, id2, "HostConfig.Links")

 	c.Assert(links, checker.Equals, "[\"/tlink1:/tlink2/tlink1\"]", check.Commentf("expected to have links between containers"))

-	status, b, err := sockRequest("DELETE", "/containers/tlink2/tlink1?link=1", nil)

+	status, b, err := request.SockRequest("DELETE", "/containers/tlink2/tlink1?link=1", nil, daemonHost())

 	c.Assert(err, check.IsNil)

 	c.Assert(status, check.Equals, http.StatusNoContent, check.Commentf(string(b)))

@@ -1123,7 +1123,7 @@ func (s *DockerSuite) TestContainerAPIDeleteConflict(c *check.C) {

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

-	status, _, err := sockRequest("DELETE", "/containers/"+id, nil)

+	status, _, err := request.SockRequest("DELETE", "/containers/"+id, nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusConflict)

 }

@@ -1145,7 +1145,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {

 	_, err = os.Stat(source)

 	c.Assert(err, checker.IsNil)

-	status, _, err := sockRequest("DELETE", "/containers/"+id+"?v=1&force=1", nil)

+	status, _, err := request.SockRequest("DELETE", "/containers/"+id+"?v=1&force=1", nil, daemonHost())

 	c.Assert(err, checker.IsNil)

 	c.Assert(status, checker.Equals, http.StatusNoContent)

 	_, err = os.Stat(source)

@@ -1154,30 +1154,21 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {

 // Regression test for https://github.com/docker/docker/issues/6231

 func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {

-	conn, err := sockConn(time.Duration(10*time.Second), "")

-	c.Assert(err, checker.IsNil)

-	client := httputil.NewClientConn(conn, nil)

-	defer client.Close()

 	config := map[string]interface{}{

 		"Image":     "busybox",

 		"Cmd":       append([]string{"/bin/sh", "-c"}, sleepCommandForDaemonPlatform()...),

 		"OpenStdin": true,

 	}

-	b, err := json.Marshal(config)

-	c.Assert(err, checker.IsNil)

-	req, err := http.NewRequest("POST", "/containers/create", bytes.NewBuffer(b))

-	c.Assert(err, checker.IsNil)

-	req.Header.Set("Content-Type", "application/json")

-	// This is a cheat to make the http request do chunked encoding

-	// Otherwise (just setting the Content-Encoding to chunked) net/http will overwrite

-	// https://golang.org/src/pkg/net/http/request.go?s=11980:12172

-	req.ContentLength = -1

-

-	resp, err := client.Do(req)

+	resp, _, err := request.Post(daemonHost(), "/containers/create", request.JSONBody(config), func(req *http.Request) error {

+		// This is a cheat to make the http request do chunked encoding

+		// Otherwise (just setting the Content-Encoding to chunked) net/http will overwrite

+		// https://golang.org/src/pkg/net/http/request.go?s=11980:12172

+		req.ContentLength = -1

+		return nil

+	})

 	c.Assert(err, checker.IsNil, check.Commentf("error creating container with chunked encoding"))