black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 08:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: TCP & WS override AcceptProxyProtocol (#425)

Browse source
This commit is contained in:
Jim Han 2021-03-29 00:16:07 +08:00 committed by GitHub
parent 6c936e2fd3
commit e564d9ef7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
transport/internet/tcp/hub.go
View file

@ -38,7 +38,8 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, streamSe
if streamSettings.SocketSettings == nil { if streamSettings.SocketSettings == nil {
streamSettings.SocketSettings = &internet.SocketConfig{} streamSettings.SocketSettings = &internet.SocketConfig{}
} }
streamSettings.SocketSettings.AcceptProxyProtocol = l.config.AcceptProxyProtocol streamSettings.SocketSettings.AcceptProxyProtocol =
l.config.AcceptProxyProtocol || streamSettings.SocketSettings.AcceptProxyProtocol
} }
var listener net.Listener var listener net.Listener
var err error var err error

3
transport/internet/websocket/hub.go
View file

@ -89,7 +89,8 @@ func ListenWS(ctx context.Context, address net.Address, port net.Port, streamSet
if streamSettings.SocketSettings == nil { if streamSettings.SocketSettings == nil {
streamSettings.SocketSettings = &internet.SocketConfig{} streamSettings.SocketSettings = &internet.SocketConfig{}
} }
streamSettings.SocketSettings.AcceptProxyProtocol = l.config.AcceptProxyProtocol streamSettings.SocketSettings.AcceptProxyProtocol =
l.config.AcceptProxyProtocol || streamSettings.SocketSettings.AcceptProxyProtocol
} }
var listener net.Listener var listener net.Listener
var err error var err error