diff --git a/dial.go b/dial.go
index 2b25e351..509882e0 100644
--- a/dial.go
+++ b/dial.go
@@ -8,7 +8,6 @@ import (
"context"
"crypto/rand"
"encoding/base64"
- "errors"
"fmt"
"io"
"io/ioutil"
@@ -74,7 +73,17 @@ func dial(ctx context.Context, urls string, opts *DialOptions, rand io.Reader) (
opts = &*opts
if opts.HTTPClient == nil {
opts.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
+ opts.HTTPClient = &newClient
}
+
if opts.HTTPHeader == nil {
opts.HTTPHeader = http.Header{}
}
@@ -133,10 +142,6 @@ func dial(ctx context.Context, urls string, opts *DialOptions, rand io.Reader) (
}
func handshakeRequest(ctx context.Context, urls string, opts *DialOptions, copts *compressionOptions, secWebSocketKey string) (*http.Response, error) {
- if opts.HTTPClient.Timeout > 0 {
- return nil, errors.New("use context for cancellation instead of http.Client.Timeout; see https://github.com/nhooyr/websocket/issues/67")
- }
-
u, err := url.Parse(urls)
if err != nil {
return nil, fmt.Errorf("failed to parse url: %w", err)
diff --git a/dial_test.go b/dial_test.go
index 7f13a934..28c255c6 100644
--- a/dial_test.go
+++ b/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",
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy