zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall2: sync upstream

Browse Source 
last commit: ed6c149c2b
This commit is contained in:
gitea-action 2024-12-16 23:00:25 +08:00
parent b5b432b44e
commit 15a748f211
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -183,8 +183,7 @@ function gen_outbound(flag, node, tag, proxy_table)
} or nil, } or nil,
wsSettings = (node.transport == "ws") and { wsSettings = (node.transport == "ws") and {
path = node.ws_path or "/", path = node.ws_path or "/",
headers = (node.ws_host ~= nil) and host = node.ws_host or nil,
{Host = node.ws_host} or nil,
maxEarlyData = tonumber(node.ws_maxEarlyData) or nil, maxEarlyData = tonumber(node.ws_maxEarlyData) or nil,
earlyDataHeaderName = (node.ws_earlyDataHeaderName) and node.ws_earlyDataHeaderName or nil, earlyDataHeaderName = (node.ws_earlyDataHeaderName) and node.ws_earlyDataHeaderName or nil,
heartbeatPeriod = tonumber(node.ws_heartbeatPeriod) or nil heartbeatPeriod = tonumber(node.ws_heartbeatPeriod) or nil
@ -483,7 +482,7 @@ function gen_config_server(node)
header = {type = node.mkcp_guise} header = {type = node.mkcp_guise}
} or nil, } or nil,
wsSettings = (node.transport == "ws") and { wsSettings = (node.transport == "ws") and {
headers = (node.ws_host) and {Host = node.ws_host} or nil, host = node.ws_host or nil,
path = node.ws_path path = node.ws_path
} or nil, } or nil,
httpSettings = (node.transport == "h2") and { httpSettings = (node.transport == "h2") and {