Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 29 Apr 2013 10:44:18 +0100
changeset 5536 abb6c6e3d6dc
parent 5534 522e99b898a0 (current diff)
parent 5535 0df0afc041d7 (diff)
child 5540 34ec16920685
Merge 0.9->trunk
--- a/plugins/mod_compression.lua	Mon Apr 29 00:36:04 2013 +0100
+++ b/plugins/mod_compression.lua	Mon Apr 29 10:44:18 2013 +0100
@@ -141,7 +141,7 @@
 		-- setup decompression for session.data
 		setup_decompression(session, inflate_stream);
 		session:reset_stream();
-		session:open_stream();
+		session:open_stream(session.from_host, session.to_host);
 		session.compressed = true;
 		return true;
 	end
--- a/plugins/mod_saslauth.lua	Mon Apr 29 00:36:04 2013 +0100
+++ b/plugins/mod_saslauth.lua	Mon Apr 29 10:44:18 2013 +0100
@@ -87,7 +87,7 @@
 	module:log("debug", "SASL EXTERNAL with %s succeeded", session.to_host);
 	session.external_auth = "succeeded"
 	session:reset_stream();
-	session:open_stream();
+	session:open_stream(session.from_host, session.to_host);
 
 	module:fire_event("s2s-authenticated", { session = session, host = session.to_host });
 	return true;