Merge pull request #183 from WeiZhang555/hijack-throw-err

Throw client.Do(req) error in postHijacked
docker · Apr 1, 2016 · 8924d69 · 8924d69
2 parents b4eede2 + abe12a7
commit 8924d69
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/hijack.go b/client/hijack.go
@@ -68,11 +68,11 @@ func (cli *Client) postHijacked(ctx context.Context, path string, query url.Valu
 	defer clientconn.Close()
 
 	// Server hijacks the connection, error 'connection closed' expected
-	clientconn.Do(req)
+	_, err = clientconn.Do(req)
 
 	rwc, br := clientconn.Hijack()
 
-	return types.HijackedResponse{Conn: rwc, Reader: br}, nil
+	return types.HijackedResponse{Conn: rwc, Reader: br}, err
 }
 
 func tlsDial(network, addr string, config *tls.Config) (net.Conn, error) {