Merge 0.9->0.10

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 6982aae30732abac9a8b17afcb5d56892700e7e4..dede0da94d7b5b60e0d5185ad906c46a105286bf 100644 (file)
--- 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