From: Pau Escrich <p4u@dabax.net>
Date: Tue, 23 Feb 2016 11:58:32 +0000 (+0100)
Subject: [luci-app-bmx6] When drawing the network topology graph, try first wget-ssl
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=3001d0ab41e30b236b7cdbd0674963bec59d4181

[luci-app-bmx6] When drawing the network topology graph, try first wget-ssl

Signed-off-by: Pau Escrich <p4u@dabax.net>
---

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