prosody
7596c37e0a63
prosodyctl

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

Software / code / prosody

Diff

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
line wrap: on
line diff
--- a/prosodyctl	Sun Oct 18 14:00:15 2015 +0200
+++ b/prosodyctl	Mon Nov 09 22:56:32 2015 +0100
@@ -890,7 +890,7 @@
 			for name in pairs(options) do
 				if name:match("^interfaces?")
 				or name:match("_ports?$") or name:match("_interfaces?$")
-				or name:match("_ssl$") then
+				or (name:match("_ssl$") and not name:match("^[cs]2s_ssl$")) then
 					misplaced_options:add(name);
 				end
 			end