Merge 0.10->trunk

2 files changed, 19 insertions, 4 deletions

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 68c4fe64..ee468c17 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -96,8 +96,19 @@ end)
 module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
 	if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end
 
-	module:log("info", "SASL EXTERNAL with %s failed", session.to_host)
-	-- TODO: Log the failure reason
+	local text = stanza:get_child_text("text");
+	local condition = "unknown-condition";
+	for child in stanza:childtags() do
+		if child.name ~= "text" then
+			condition = child.name;
+			break;
+		end
+	end
+	if text and condition then
+		condition = connection .. ": " .. text;
+	end
+	module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition);
+
 	session.external_auth = "failed"
 	session:close();
 	return true;
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 47d170a1..3c96f780 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -51,13 +51,17 @@ local sessions = module:shared("c2s/sessions");
 local c2s_listener = portmanager.get_service("c2s").listener;
 
 --- Session methods
-local function session_open_stream(session)
+local function session_open_stream(session, from, to)
 	local attr = {
 		xmlns = xmlns_framing,
+		["xml:lang"] = "en",
 		version = "1.0",
 		id = session.streamid or "",
-		from = session.host
+		from = from or session.host, to = to,
 	};
+	if session.stream_attrs then
+		session:stream_attrs(from, to, attr)
+	end
 	session.send(st.stanza("open", attr));
 end