fixup! Merge pull request #261 from swithek/copy-http-client

Author: nhooyr

dial.go

@@ -46,18 +46,17 @@ type DialOptions struct {
 	CompressionThreshold int
 }
 
-func (opts *DialOptions) cloneWithDefaults() *DialOptions {
+func (opts *DialOptions) cloneWithDefaults(ctx context.Context) (context.Context, context.CancelFunc, *DialOptions) {
+	var cancel context.CancelFunc
+
 	var o DialOptions
 	if opts != nil {
 		o = *opts
 	}
 	if o.HTTPClient == nil {
 		o.HTTPClient = http.DefaultClient
 	} else if opts.HTTPClient.Timeout > 0 {
-		var cancel context.CancelFunc
-
 		ctx, cancel = context.WithTimeout(ctx, opts.HTTPClient.Timeout)
-		defer cancel()
 
 		newClient := *opts.HTTPClient
 		newClient.Timeout = 0
@@ -66,7 +65,8 @@ func (opts *DialOptions) cloneWithDefaults() *DialOptions {
 	if o.HTTPHeader == nil {
 		o.HTTPHeader = http.Header{}
 	}
-	return &o
+
+	return ctx, cancel, &o
 }
 
 // Dial performs a WebSocket handshake on url.
@@ -89,7 +89,11 @@ func Dial(ctx context.Context, u string, opts *DialOptions) (*Conn, *http.Respon
 func dial(ctx context.Context, urls string, opts *DialOptions, rand io.Reader) (_ *Conn, _ *http.Response, err error) {
 	defer errd.Wrap(&err, "failed to WebSocket dial")
 
-	opts = opts.cloneWithDefaults()
+	var cancel context.CancelFunc
+	ctx, cancel, opts = opts.cloneWithDefaults(ctx)
+	if cancel != nil {
+		defer cancel()
+	}
 
 	secWebSocketKey, err := secWebSocketKey(rand)
 	if err != nil {
@@ -246,7 +250,8 @@ func verifyServerExtensions(copts *compressionOptions, h http.Header) (*compress
 		return nil, fmt.Errorf("WebSocket protcol violation: unsupported extensions from server: %+v", exts[1:])
 	}
 
-	copts = &*copts
+	_copts := *copts
+	copts = &_copts
 
 	for _, p := range ext.params {
 		switch p {

internal/test/wstest/pipe.go

@@ -24,7 +24,8 @@ func Pipe(dialOpts *websocket.DialOptions, acceptOpts *websocket.AcceptOptions)
 	if dialOpts == nil {
 		dialOpts = &websocket.DialOptions{}
 	}
-	dialOpts = &*dialOpts
+	_dialOpts := *dialOpts
+	dialOpts = &_dialOpts
 	dialOpts.HTTPClient = &http.Client{
 		Transport: tt,
 	}