Comparison

util/dependencies.lua @ 7723:488fddf88ffd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 19 Nov 2016 01:05:36 +0100
parent 7686:8d6f367bed8c
parent 7721:92f771147de8
child 7768:57d0f2d3d5c5
comparison
equal deleted inserted replaced
7719:17c7e3ac47f7 7723:488fddf88ffd
134 end 134 end
135 return not fatal; 135 return not fatal;
136 end 136 end
137 137
138 local function log_warnings() 138 local function log_warnings()
139 if _VERSION > "Lua 5.1" then 139 if _VERSION > "Lua 5.2" then
140 prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION); 140 prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
141 end 141 end
142 local ssl = softreq"ssl"; 142 local ssl = softreq"ssl";
143 if ssl then 143 if ssl then
144 local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)"); 144 local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");