prosody
7596c37e0a63
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 6920:7596c37e0a63

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 09 Nov 2015 22:56:32 +0100
parent 6914:5df76208e050
child 6957:e442016918a9
comparison
equal deleted inserted replaced
6909:494938dec5d8 6920:7596c37e0a63
888 local host_options = set.new(it.to_array(it.keys(options))); 888 local host_options = set.new(it.to_array(it.keys(options)));
889 local misplaced_options = set.intersection(host_options, known_global_options); 889 local misplaced_options = set.intersection(host_options, known_global_options);
890 for name in pairs(options) do 890 for name in pairs(options) do
891 if name:match("^interfaces?") 891 if name:match("^interfaces?")
892 or name:match("_ports?$") or name:match("_interfaces?$") 892 or name:match("_ports?$") or name:match("_interfaces?$")
893 or name:match("_ssl$") then 893 or (name:match("_ssl$") and not name:match("^[cs]2s_ssl$")) then
894 misplaced_options:add(name); 894 misplaced_options:add(name);
895 end 895 end
896 end 896 end
897 if not misplaced_options:empty() then 897 if not misplaced_options:empty() then
898 ok = false; 898 ok = false;