From c219b09d4aeb71bc628bc8377b600db06fe71569 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 14 Jul 2023 19:50:41 +0200 Subject: [PATCH] client: Client.postHijacked: use Client.buildRequest Use Client.buildRequest instead of a local copy of the same logic so that we're using the same logic, and there's less chance of diverging. Signed-off-by: Sebastiaan van Stijn --- client/hijack.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/client/hijack.go b/client/hijack.go index 08f0744bd1..7e84865f69 100644 --- a/client/hijack.go +++ b/client/hijack.go @@ -23,14 +23,10 @@ func (cli *Client) postHijacked(ctx context.Context, path string, query url.Valu if err != nil { return types.HijackedResponse{}, err } - - apiPath := cli.getAPIPath(ctx, path, query) - req, err := http.NewRequest(http.MethodPost, apiPath, bodyEncoded) + req, err := cli.buildRequest(http.MethodPost, cli.getAPIPath(ctx, path, query), bodyEncoded, headers) if err != nil { return types.HijackedResponse{}, err } - req = cli.addHeaders(req, headers) - conn, mediaType, err := cli.setupHijackConn(ctx, req, "tcp") if err != nil { return types.HijackedResponse{}, err @@ -64,11 +60,6 @@ func fallbackDial(proto, addr string, tlsConfig *tls.Config) (net.Conn, error) { } func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto string) (net.Conn, string, error) { - req.URL.Host = cli.addr - if cli.proto == "unix" || cli.proto == "npipe" { - // Override host header for non-tcp connections. - req.Host = DummyHost - } req.Header.Set("Connection", "Upgrade") req.Header.Set("Upgrade", proto)