diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:05:18 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:05:18 +0100 |
| commit | 656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3 (patch) | |
| tree | f9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /util/xmppstream.lua | |
| parent | bf66f0049f2e7682ed6354388db92a2b25ea67b6 (diff) | |
| parent | 878efeecd5030048b33121b05c6cf402f860ca1d (diff) | |
| download | prosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.tar.gz prosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
| -rw-r--r-- | util/xmppstream.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 6982aae3..dede0da9 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -109,7 +109,7 @@ function new_sax_handlers(session, stream_callbacks, cb_handleprogress) end else -- Garbage before stream? - cb_error(session, "no-stream"); + cb_error(session, "no-stream", tagname); end return; end @@ -249,7 +249,7 @@ function new(session, stream_callbacks, stanza_size_limit) ["xml:lang"] = "en", xmlns = stream_callbacks.default_ns, version = session.version and (session.version > 0 and "1.0" or nil), - id = session.streamid or "", + id = session.streamid, from = from or session.host, to = to, }; if session.stream_attrs then |