Commitfdc4079

authored

Clone options (#259)

1 parent897a573 commitfdc4079Copy full SHA for fdc4079

File tree

+24

-16

lines changed

+24

-16

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,14 @@ type AcceptOptions struct {`
`63`	`63`	`CompressionThresholdint`
`64`	`64`	`}`
`65`	`65`
	`66`	`+func (optsAcceptOptions)cloneWithDefaults()AcceptOptions {`
	`67`	`+varoAcceptOptions`
	`68`	`+ifopts!=nil {`
	`69`	`+o=*opts`
	`70`	`+}`
	`71`	`+return&o`
	`72`	`+}`
	`73`	`+`
`66`	`74`	`// Accept accepts a WebSocket handshake from a client and upgrades the`
`67`	`75`	`// the connection to a WebSocket.`
`68`	`76`	`//`
`@@ -77,17 +85,13 @@ func Accept(w http.ResponseWriter, r http.Request, opts AcceptOptions) (*Conn,`
`77`	`85`	`funcaccept(w http.ResponseWriter,rhttp.Request,optsAcceptOptions) (_*Conn,errerror) {`
`78`	`86`	`defererrd.Wrap(&err,"failed to accept WebSocket connection")`
`79`	`87`
`80`		`-ifopts==nil {`
`81`		`-opts=&AcceptOptions{}`
`82`		`-}`
`83`		`-opts=&*opts`
`84`		`-`
`85`	`88`	`errCode,err:=verifyClientRequest(w,r)`
`86`	`89`	`iferr!=nil {`
`87`	`90`	`http.Error(w,err.Error(),errCode)`
`88`	`91`	`returnnil,err`
`89`	`92`	`}`
`90`	`93`
	`94`	`+opts=opts.cloneWithDefaults()`
`91`	`95`	`if!opts.InsecureSkipVerify {`
`92`	`96`	`err=authenticateOrigin(r,opts.OriginPatterns)`
`93`	`97`	`iferr!=nil {`

Lines changed: 15 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,20 @@ type DialOptions struct {`
`47`	`47`	`CompressionThresholdint`
`48`	`48`	`}`
`49`	`49`
	`50`	`+func (optsDialOptions)cloneWithDefaults()DialOptions {`
	`51`	`+varoDialOptions`
	`52`	`+ifopts!=nil {`
	`53`	`+o=*opts`
	`54`	`+}`
	`55`	`+ifo.HTTPClient==nil {`
	`56`	`+o.HTTPClient=http.DefaultClient`
	`57`	`+}`
	`58`	`+ifo.HTTPHeader==nil {`
	`59`	`+o.HTTPHeader= http.Header{}`
	`60`	`+}`
	`61`	`+return&o`
	`62`	`+}`
	`63`	`+`
`50`	`64`	`// Dial performs a WebSocket handshake on url.`
`51`	`65`	`//`
`52`	`66`	`// The response is the WebSocket handshake response from the server.`
`@@ -67,17 +81,7 @@ func Dial(ctx context.Context, u string, opts DialOptions) (Conn, *http.Respon`
`67`	`81`	`funcdial(ctx context.Context,urlsstring,optsDialOptions,rand io.Reader) (_Conn,_*http.Response,errerror) {`
`68`	`82`	`defererrd.Wrap(&err,"failed to WebSocket dial")`
`69`	`83`
`70`		`-ifopts==nil {`
`71`		`-opts=&DialOptions{}`
`72`		`-}`
`73`		`-`
`74`		`-opts=&*opts`
`75`		`-ifopts.HTTPClient==nil {`
`76`		`-opts.HTTPClient=http.DefaultClient`
`77`		`-}`
`78`		`-ifopts.HTTPHeader==nil {`
`79`		`-opts.HTTPHeader= http.Header{}`
`80`		`-}`
	`84`	`+opts=opts.cloneWithDefaults()`
`81`	`85`
`82`	`86`	`secWebSocketKey,err:=secWebSocketKey(rand)`
`83`	`87`	`iferr!=nil {`

Comments

(0)