Merge pull request #277 from nhooyr/merge-master

Merge master into dev

Author: nhooyr

accept.go

@@ -163,13 +163,13 @@ func verifyClientRequest(w http.ResponseWriter, r *http.Request) (errCode int, _
 returnhttp.StatusUpgradeRequired, fmt.Errorf("WebSocket protocol violation: handshake request must be at least HTTP/1.1: %q", r.Proto)
  }
 
-if!headerContainsToken(r.Header, "Connection", "Upgrade"){
+if!headerContainsTokenIgnoreCase(r.Header, "Connection", "Upgrade"){
 w.Header().Set("Connection", "Upgrade")
 w.Header().Set("Upgrade", "websocket")
 returnhttp.StatusUpgradeRequired, fmt.Errorf("WebSocket protocol violation: Connection header %q does not contain Upgrade", r.Header.Get("Connection"))
  }
 
-if!headerContainsToken(r.Header, "Upgrade", "websocket"){
+if!headerContainsTokenIgnoreCase(r.Header, "Upgrade", "websocket"){
 w.Header().Set("Connection", "Upgrade")
 w.Header().Set("Upgrade", "websocket")
 returnhttp.StatusUpgradeRequired, fmt.Errorf("WebSocket protocol violation: Upgrade header %q does not contain websocket", r.Header.Get("Upgrade"))
@@ -313,11 +313,9 @@ func acceptWebkitDeflate(w http.ResponseWriter, ext websocketExtension, mode Com
 returncopts, nil
 }
 
-funcheaderContainsToken(h http.Header, key, tokenstring) bool{
-token=strings.ToLower(token)
-
+funcheaderContainsTokenIgnoreCase(h http.Header, key, tokenstring) bool{
 for_, t:=rangeheaderTokens(h, key){
-ift==token{
+ifstrings.EqualFold(t, token){
 returntrue
  }
  }
@@ -358,7 +356,6 @@ func headerTokens(h http.Header, key string) []string{
 for_, v:=rangeh[key]{
 v=strings.TrimSpace(v)
 for_, t:=rangestrings.Split(v, ","){
-t=strings.ToLower(t)
 t=strings.TrimSpace(t)
 tokens=append(tokens, t)
  }

accept_test.go

@@ -226,6 +226,12 @@ func Test_selectSubprotocol(t *testing.T){
 serverProtocols: []string{"echo2", "echo3"},
 negotiated: "echo3",
  },
+{
+name: "clientCasePresered",
+clientProtocols: []string{"Echo1"},
+serverProtocols: []string{"echo1"},
+negotiated: "Echo1",
+ },
  }
 
 for_, tc:=rangetestCases{

ci/test.sh

@@ -5,9 +5,9 @@ main(){
 cd"$(dirname "$0")/.."
 
  go test -timeout=30m -covermode=atomic -coverprofile=ci/out/coverage.prof -coverpkg=./... "$@" ./...
- sed -i '/stringer\.go/d' ci/out/coverage.prof
- sed -i '/nhooyr.io\/websocket\/internal\/test/d' ci/out/coverage.prof
- sed -i '/examples/d' ci/out/coverage.prof
+ sed -i.bak'/stringer\.go/d' ci/out/coverage.prof
+ sed -i.bak'/nhooyr.io\/websocket\/internal\/test/d' ci/out/coverage.prof
+ sed -i.bak'/examples/d' ci/out/coverage.prof
 
 # Last line is the total coverage.
  go tool cover -func ci/out/coverage.prof | tail -n1

dial.go

@@ -8,7 +8,6 @@ import (
 "context"
 "crypto/rand"
 "encoding/base64"
-"errors"
 "fmt"
 "io"
 "io/ioutil"
@@ -47,18 +46,27 @@ type DialOptions struct{
 CompressionThresholdint
 }
 
-func (opts*DialOptions) cloneWithDefaults() *DialOptions{
+func (opts*DialOptions) cloneWithDefaults(ctx context.Context) (context.Context, context.CancelFunc, *DialOptions){
+varcancel context.CancelFunc
+
 varoDialOptions
 ifopts!=nil{
 o=*opts
  }
 ifo.HTTPClient==nil{
 o.HTTPClient=http.DefaultClient
+ } elseifopts.HTTPClient.Timeout>0{
+ctx, cancel=context.WithTimeout(ctx, opts.HTTPClient.Timeout)
+
+newClient:=*opts.HTTPClient
+newClient.Timeout=0
+opts.HTTPClient=&newClient
  }
 ifo.HTTPHeader==nil{
 o.HTTPHeader= http.Header{}
  }
-return&o
+
+returnctx, cancel, &o
 }
 
 // Dial performs a WebSocket handshake on url.
@@ -81,7 +89,11 @@ func Dial(ctx context.Context, u string, opts *DialOptions) (*Conn, *http.Respon
 funcdial(ctx context.Context, urlsstring, opts*DialOptions, rand io.Reader) (_*Conn, _*http.Response, errerror){
 defererrd.Wrap(&err, "failed to WebSocket dial")
 
-opts=opts.cloneWithDefaults()
+varcancel context.CancelFunc
+ctx, cancel, opts=opts.cloneWithDefaults(ctx)
+ifcancel!=nil{
+defercancel()
+ }
 
 secWebSocketKey, err:=secWebSocketKey(rand)
 iferr!=nil{
@@ -137,10 +149,6 @@ func dial(ctx context.Context, urls string, opts *DialOptions, rand io.Reader) (
 }
 
 funchandshakeRequest(ctx context.Context, urlsstring, opts*DialOptions, copts*compressionOptions, secWebSocketKeystring) (*http.Response, error){
-ifopts.HTTPClient.Timeout>0{
-returnnil, errors.New("use context for cancellation instead of http.Client.Timeout; see https://github.com/nhooyr/websocket/issues/67")
- }
-
 u, err:=url.Parse(urls)
 iferr!=nil{
 returnnil, fmt.Errorf("failed to parse url: %w", err)
@@ -193,11 +201,11 @@ func verifyServerResponse(opts *DialOptions, copts *compressionOptions, secWebSo
 returnnil, fmt.Errorf("expected handshake response status code %v but got %v", http.StatusSwitchingProtocols, resp.StatusCode)
  }
 
-if!headerContainsToken(resp.Header, "Connection", "Upgrade"){
+if!headerContainsTokenIgnoreCase(resp.Header, "Connection", "Upgrade"){
 returnnil, fmt.Errorf("WebSocket protocol violation: Connection header %q does not contain Upgrade", resp.Header.Get("Connection"))
  }
 
-if!headerContainsToken(resp.Header, "Upgrade", "WebSocket"){
+if!headerContainsTokenIgnoreCase(resp.Header, "Upgrade", "WebSocket"){
 returnnil, fmt.Errorf("WebSocket protocol violation: Upgrade header %q does not contain websocket", resp.Header.Get("Upgrade"))
  }
 
@@ -242,7 +250,8 @@ func verifyServerExtensions(copts *compressionOptions, h http.Header) (*compress
 returnnil, fmt.Errorf("WebSocket protcol violation: unsupported extensions from server: %+v", exts[1:])
  }
 
-copts=&*copts
+_copts:=*copts
+copts=&_copts
 
 for_, p:=rangeext.params{
 switchp{

dial_test.go

@@ -36,15 +36,6 @@ func TestBadDials(t *testing.T){
 name: "badURLScheme",
 url: "ftp://nhooyr.io",
  },
-{
-name: "badHTTPClient",
-url: "ws://nhooyr.io",
-opts: &DialOptions{
-HTTPClient: &http.Client{
-Timeout: time.Minute,
- },
- },
- },
 {
 name: "badTLS",
 url: "wss://totallyfake.nhooyr.io",

examples/echo/server.go

@@ -16,7 +16,6 @@ import (
 // It ensures the client speaks the echo subprotocol and
 // only allows one message every 100ms with a 10 message burst.
 typeechoServerstruct{
-
 // logf controls where logs are sent.
 logffunc(fstring, v...interface{})
 }

internal/test/wstest/pipe.go

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