aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-29 22:31:10 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-29 22:31:10 +0000
commitab1dfc9541f1b87bdfff77da06713f713c7f8db3 (patch)
treeda1df8887aac2254a1a67f3ec6c8fea93d3ad4fb
parenta3737f12adae1ad6ae1b2aebb663de4e58daecec (diff)
downloadprosody-ab1dfc9541f1b87bdfff77da06713f713c7f8db3.tar.gz
prosody-ab1dfc9541f1b87bdfff77da06713f713c7f8db3.zip
Don't use TLS connection handler when SSL/TLS not available or configured (thanks to Ricardo for finding)
-rwxr-xr-xprosody2
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody b/prosody
index 2cff8ca4..b4a18c67 100755
--- a/prosody
+++ b/prosody
@@ -140,7 +140,7 @@ local function do_ports(option, listener, default, conntype)
end
end
-do_ports("c2s_ports", "xmppclient", {5222}, "tls");
+do_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
do_ports("s2s_ports", "xmppserver", {5269}, "tcp");
do_ports("legacy_ssl_ports", "xmppclient", {}, "ssl");