diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
| commit | fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba (patch) | |
| tree | 04f1aa322632a0221c225ee6957b5863755a3b6d /core/s2smanager.lua | |
| parent | 4ce313959b678592a5fe0ef30b6813d058de45af (diff) | |
| parent | 2c3ccf56744975a5f5acbc66d2e917e056467965 (diff) | |
| download | prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.tar.gz prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.zip | |
Merge with main branch.
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 879084d8..75bb5d36 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -238,7 +238,7 @@ function try_connect(host_session, connect_host, connect_port) conn:settimeout(0); local success, err = conn:connect(connect_host, connect_port); if not success and err ~= "timeout" then - log("warn", "s2s connect() failed: %s", err); + log("warn", "s2s connect() to %s (%s:%d) failed: %s", host_session.to_host, connect_host, connect_port, err); return false; end @@ -253,7 +253,7 @@ function try_connect(host_session, connect_host, connect_port) local w = conn.write; host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end - conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host)); + conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host)); log("debug", "Connection attempt in progress..."); return true; end |