[代理]Websocket传递subprotocol参数

iwind · iwind · commit 466d596f1214 · 2020-11-30T16:09:45.000+08:00
diff --git a/internal/teaproxy/request_websocket.go b/internal/teaproxy/request_websocket.go
@@ -40,6 +40,7 @@ func (this *Request) callWebsocket(writer *ResponseWriter) error {
 			}
 			return this.websocket.MatchOrigin(origin)
 		},
+		Subprotocols: websocket.Subprotocols(this.raw),
 	}
 
 	// 自动补充Header
@@ -122,6 +123,7 @@ func (this *Request) callWebsocket(writer *ResponseWriter) error {
 			},
 			TLSClientConfig:  tlsConfig,
 			HandshakeTimeout: this.backend.FailTimeoutDuration(),
+			Subprotocols:     websocket.Subprotocols(this.raw),
 		}
 		header := http.Header{}
 		for k, v := range this.raw.Header {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ func (this Request) callWebsocket(writer ResponseWriter) error {`
`40`	`40`	`}`
`41`	`41`	`return this.websocket.MatchOrigin(origin)`
`42`	`42`	`},`
	`43`	`+ Subprotocols: websocket.Subprotocols(this.raw),`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`// 自动补充Header`
`@@ -122,6 +123,7 @@ func (this Request) callWebsocket(writer ResponseWriter) error {`
`122`	`123`	`},`
`123`	`124`	`TLSClientConfig: tlsConfig,`
`124`	`125`	`HandshakeTimeout: this.backend.FailTimeoutDuration(),`
	`126`	`+ Subprotocols: websocket.Subprotocols(this.raw),`
`125`	`127`	`}`
`126`	`128`	`header := http.Header{}`
`127`	`129`	`for k, v := range this.raw.Header {`