mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-30 09:18:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update proto file for websocket and httpupgrade (breaking)

Browse source
This commit is contained in:
yuhan6665 2024-03-29 01:39:59 -04:00 • committed by RPRX
parent 53e5814d19
commit e2302b421c
12 changed files with 121 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

7
infra/conf/transport_internet.go
View file

@ -154,12 +154,9 @@ type WebSocketConfig struct {
// Build implements Buildable.
func (c *WebSocketConfig) Build() (proto.Message, error) {
path := c.Path
header := make([]*websocket.Header, 0, 32)
header := make(map[string]string);
for key, value := range c.Headers {
header = append(header, &websocket.Header{
Key: key,
Value: value,
})
header[key] = value;
}
var ed uint32
if u, err := url.Parse(path); err == nil {

14
infra/conf/xray_test.go
View file

@ -236,11 +236,8 @@ func TestXrayConfig(t *testing.T) {
{
ProtocolName: "websocket",
Settings: serial.ToTypedMessage(&websocket.Config{
Header: []*websocket.Header{
{
Key: "host",
Value: "example.domain",
},
Header: map[string]string{
"host": "example.domain",
},
}),
},
@ -291,11 +288,8 @@ func TestXrayConfig(t *testing.T) {
{
ProtocolName: "websocket",
Settings: serial.ToTypedMessage(&websocket.Config{
Header: []*websocket.Header{
{
Key: "host",
Value: "example.domain",
},
Header: map[string]string{
"host": "example.domain",
},
}),
},