Merge branch 'main' into fix-default-close-handler-return-error

Corey Daley · web-flow · commit 07089bb6d10a · 2023-11-12T19:43:02.000-05:00
diff --git a/client.go b/client.go
@@ -399,7 +399,7 @@ func (d *Dialer) DialContext(ctx context.Context, urlStr string, requestHeader h
 		}
 	}
 
-	if resp.StatusCode != 101 ||
+	if resp.StatusCode != http.StatusSwitchingProtocols ||
 		!tokenListContainsValue(resp.Header, "Upgrade", "websocket") ||
 		!tokenListContainsValue(resp.Header, "Connection", "upgrade") ||
 		resp.Header.Get("Sec-Websocket-Accept") != computeAcceptKey(challengeKey) {
diff --git a/proxy.go b/proxy.go
@@ -75,7 +75,7 @@ func (hpd *httpProxyDialer) Dial(network string, addr string) (net.Conn, error)
 		return nil, err
 	}
 
-	if resp.StatusCode != 200 {
+	if resp.StatusCode != http.StatusOK {
 		if err := conn.Close(); err != nil {
 			log.Printf("httpProxyDialer: failed to close connection: %v", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func (d *Dialer) DialContext(ctx context.Context, urlStr string, requestHeader h`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`- if resp.StatusCode != 101 \|\|`
	`402`	`+ if resp.StatusCode != http.StatusSwitchingProtocols \|\|`
`403`	`403`	`!tokenListContainsValue(resp.Header, "Upgrade", "websocket") \|\|`
`404`	`404`	`!tokenListContainsValue(resp.Header, "Connection", "upgrade") \|\|`
`405`	`405`	`resp.Header.Get("Sec-Websocket-Accept") != computeAcceptKey(challengeKey) {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func (hpd *httpProxyDialer) Dial(network string, addr string) (net.Conn, error)`
`75`	`75`	`return nil, err`
`76`	`76`	`}`
`77`	`77`
`78`		`- if resp.StatusCode != 200 {`
	`78`	`+ if resp.StatusCode != http.StatusOK {`
`79`	`79`	`if err := conn.Close(); err != nil {`
`80`	`80`	`log.Printf("httpProxyDialer: failed to close connection: %v", err)`
`81`	`81`	`}`