prosody
12fc7e005e8b
core/s2smanager.lua

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

Software / code / prosody

Diff

core/s2smanager.lua @ 3312:12fc7e005e8b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Jul 2010 17:44:14 +0100
parent 3308:f5243ca9662f
parent 3309:1c58cb93ef3e
child 3329:9adafeeadecb
line wrap: on
line diff
--- a/core/s2smanager.lua	Fri Jul 02 17:43:01 2010 +0100
+++ b/core/s2smanager.lua	Fri Jul 02 17:44:14 2010 +0100
@@ -208,7 +208,7 @@
 
 function attempt_connection(host_session, err)
 	local from_host, to_host = host_session.from_host, host_session.to_host;
-	local connect_host, connect_port = idna_to_ascii(to_host), 5269;
+	local connect_host, connect_port = to_host and idna_to_ascii(to_host), 5269;
 	
 	if not connect_host then
 		return false;