mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Matthew Wild 2016-03-23 12:19:23 +00:00
commit 5aed003747
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
prosodyctl
View file

@ -1063,11 +1063,15 @@ function commands.check(arg)
local v6_supported = not not socket.tcp6;
for host, host_options in enabled_hosts() do
for jid, host_options in enabled_hosts() do
local all_targets_ok, some_targets_ok = true, false;
local node, host = jid_split(jid);
local is_component = not not host_options.component_module;
print("Checking DNS for "..(is_component and "component" or "host").." "..host.."...");
print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
if node then
print("Only the domain part ("..host..") is used in DNS.")
end
local target_hosts = set.new();
if not is_component then
local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");

2
util/sql.lua
View file

@ -328,7 +328,7 @@ function engine:set_encoding() -- to UTF-8
local ok, actual_charset = self:transaction(function ()
return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
end);
local charset_ok;
local charset_ok = true;
for row in actual_charset do
if row[2] ~= charset then
log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset);