# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367228658 -3600
# Node ID abb6c6e3d6dc53c10f017dcf7b40325fc1039673
# Parent  522e99b898a082a7080043b96fcc5595dd0bec2d# Parent  0df0afc041d76781daba0e4493958895c5debcf6
Merge 0.9->trunk

diff -r 522e99b898a0 -r abb6c6e3d6dc plugins/mod_compression.lua
--- 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
diff -r 522e99b898a0 -r abb6c6e3d6dc plugins/mod_saslauth.lua
--- 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;