@@ -77,7 +77,7 @@ function refresh_data()
local retstring = 0
local function update(url, file, type, file2)
local Num = 1
- refresh_cmd = "wget-ssl --no-check-certificate -t 3 -T 10 -O- " .. url .. " > /tmp/ssr-update." .. type
+ refresh_cmd = "wget --no-check-certificate -t 3 -T 10 -O- " .. url .. " > /tmp/ssr-update." .. type
sret = luci.sys.call(refresh_cmd .. " 2>/dev/null")
if sret == 0 then
if type == "gfw_data" then
@@ -90,10 +90,10 @@ outbound = {
},
seed = server.seed or nil
} or nil,
- wsSettings = (server.transport == "ws") and (server.ws_path or server.ws_host) and {
+ wsSettings = (server.transport == "ws") and (server.ws_path or server.ws_host or server.tls_host) and {
path = server.ws_path,
- headers = (server.ws_host) and {
- Host = server.ws_host
+ headers = (server.ws_host or server.tls_host) and {
+ Host = server.ws_host or server.tls_host
httpSettings = (server.transport == "h2") and {
@@ -278,7 +278,7 @@ local function processData(szType, content)
end
-- wget
local function wget(url)
- local stdout = luci.sys.exec('wget-ssl -q --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36" --no-check-certificate -t 3 -T 10 -O- "' .. url .. '"')
+ local stdout = luci.sys.exec('wget -q --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36" --no-check-certificate -t 3 -T 10 -O- "' .. url .. '"')
return trim(stdout)
@@ -13,7 +13,7 @@ end