Sep 24, 2020 · Sep 9, 2020
diff --git a/accept.go b/accept.go
 CompressionThreshold int
 }

 func (opts *AcceptOptions) cloneWithDefaults() *AcceptOptions {
 var o AcceptOptions
 if opts != nil {
 o = *opts
 }
 return &o
 }

 // Accept accepts a WebSocket handshake from a client and upgrades the
 // the connection to a WebSocket.
 //
 func accept(w http.ResponseWriter, r *http.Request, opts *AcceptOptions) (_ *Conn, err error) {
 defer errd.Wrap(&err, "failed to accept WebSocket connection")

 if opts == nil {
 opts = &AcceptOptions{}
 }
 opts = &*opts

 errCode, err := verifyClientRequest(w, r)
 if err != nil {
 http.Error(w, err.Error(), errCode)
 return nil, err
 }

 opts = opts.cloneWithDefaults()
 if !opts.InsecureSkipVerify {
 err = authenticateOrigin(r, opts.OriginPatterns)
 if err != nil {
diff --git a/dial.go b/dial.go
 CompressionThreshold int
 }

 func (opts *DialOptions) cloneWithDefaults() *DialOptions {
 var o DialOptions
 if opts != nil {
 o = *opts
 }
 if o.HTTPClient == nil {
 o.HTTPClient = http.DefaultClient
 }
 if o.HTTPHeader == nil {
 o.HTTPHeader = http.Header{}
 }
 return &o
 }

 // Dial performs a WebSocket handshake on url.
 //
 // The response is the WebSocket handshake response from the server.
 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")

 if opts == nil {
 opts = &DialOptions{}
 }

 opts = &*opts
 if opts.HTTPClient == nil {
 opts.HTTPClient = http.DefaultClient
 }
 if opts.HTTPHeader == nil {
 opts.HTTPHeader = http.Header{}
 }
 opts = opts.cloneWithDefaults()

 secWebSocketKey, err := secWebSocketKey(rand)
 if err != nil {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,6 +63,14 @@ type AcceptOptions struct {
		CompressionThreshold int
		}

		func (opts AcceptOptions) cloneWithDefaults() AcceptOptions {
		var o AcceptOptions
		if opts != nil {
		o = *opts
		}
		return &o
		}

		// Accept accepts a WebSocket handshake from a client and upgrades the
		// the connection to a WebSocket.
		//
Expand All		@@ -77,17 +85,13 @@ func Accept(w http.ResponseWriter, r http.Request, opts AcceptOptions) (*Conn,
		func accept(w http.ResponseWriter, r http.Request, opts AcceptOptions) (_ *Conn, err error) {
		defer errd.Wrap(&err, "failed to accept WebSocket connection")

		if opts == nil {
		opts = &AcceptOptions{}
		}
		opts = &*opts

		errCode, err := verifyClientRequest(w, r)
		if err != nil {
		http.Error(w, err.Error(), errCode)
		return nil, err
		}

		opts = opts.cloneWithDefaults()
		if !opts.InsecureSkipVerify {
		err = authenticateOrigin(r, opts.OriginPatterns)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,6 +47,20 @@ type DialOptions struct {
		CompressionThreshold int
		}

		func (opts DialOptions) cloneWithDefaults() DialOptions {
		var o DialOptions
		if opts != nil {
		o = *opts
		}
		if o.HTTPClient == nil {
		o.HTTPClient = http.DefaultClient
		}
		if o.HTTPHeader == nil {
		o.HTTPHeader = http.Header{}
		}
		return &o
		}

		// Dial performs a WebSocket handshake on url.
		//
		// The response is the WebSocket handshake response from the server.
Expand All		@@ -67,17 +81,7 @@ 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")

		if opts == nil {
		opts = &DialOptions{}
		}

		opts = &*opts
		if opts.HTTPClient == nil {
		opts.HTTPClient = http.DefaultClient
		}
		if opts.HTTPHeader == nil {
		opts.HTTPHeader = http.Header{}
		}
		opts = opts.cloneWithDefaults()

		secWebSocketKey, err := secWebSocketKey(rand)
		if err != nil {
Expand Down