X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=luci-app-bmx6%2Ffiles%2Fusr%2Flib%2Flua%2Fluci%2Fmodel%2Fbmx6json.lua;h=a4a8e438ef5d63acafb2458f18ffc1afbdee8f8e;hb=a3972affe78f433ccb95b876ae596397cf707372;hp=dfe9ab1f393453fee018bd88f044bbe1719ee946;hpb=38be3fb0732dcd69682d96fcee3d73199f65507c;p=feed%2Frouting.git diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua b/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua index dfe9ab1..a4a8e43 100644 --- a/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua +++ b/luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua @@ -112,12 +112,16 @@ function wget(url, timeout) if pid == 0 then rfd:close() nixio.dup(wfd, nixio.stdout) - - local candidates = { "/usr/bin/wget", "/bin/wget" } + -- candidates for wget, try first ones with SSL support + local candidates = {{"/usr/bin/wget-ssl",1},{"/usr/bin/wget",0},{"/bin/wget",0}} local _, bin for _, bin in ipairs(candidates) do - if nixiofs.access(bin, "x") then - nixio.exec(bin, "-q", "-O", "-", url) + if nixiofs.access(bin[1], "x") then + if bin[2] == 0 then + nixio.exec(bin[1], "-q", "-O", "-", url) + else + nixio.exec(bin[1], "--no-check-certificate", "-q", "-O", "-", url) + end end end return