diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:44:18 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:44:18 +0100 |
| commit | 491dd96b247d30765711215d7ce0161af8e3f73e (patch) | |
| tree | 692b1c0cd9383d0c9d510eb1b37f8fc328b3e040 | |
| parent | e157445db73e3901eced621c1117a1ea508ea4b6 (diff) | |
| parent | 073282787b0f983a57863ad2304c7daf7d3a9066 (diff) | |
| download | prosody-491dd96b247d30765711215d7ce0161af8e3f73e.tar.gz prosody-491dd96b247d30765711215d7ce0161af8e3f73e.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/mod_compression.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua index 44bc05fe..92856099 100644 --- a/plugins/mod_compression.lua +++ b/plugins/mod_compression.lua @@ -141,7 +141,7 @@ module:hook("stanza/http://jabber.org/protocol/compress:compressed", function(ev -- 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 --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index b75b1844..201cc477 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -87,7 +87,7 @@ module:hook_stanza(xmlns_sasl, "success", function (session, stanza) 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; |