diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-07-02 17:44:14 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-07-02 17:44:14 +0100 |
| commit | f654c430081b0161e66e28c70e6da80a5da99250 (patch) | |
| tree | 27fb0b62bf1c29b28376fe4ff61f372f4381bdb1 /core | |
| parent | 1309f761cb42ad3502fda993efaf56cb3dca3860 (diff) | |
| parent | e563e751d0f7293ebd22cc9d8896c6cd041c1bf6 (diff) | |
| download | prosody-f654c430081b0161e66e28c70e6da80a5da99250.tar.gz prosody-f654c430081b0161e66e28c70e6da80a5da99250.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 5853b2ec..9d29689f 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -208,7 +208,7 @@ end 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; |