diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
| commit | 8407f360939fe103a991641b0bf3b85e87d660b9 (patch) | |
| tree | 4b71bdc7622635a101579c04b2d9e0c56991df2c /plugins/mod_websocket.lua | |
| parent | a11a584a59cde70ce4f0880049b9e675d8b2e223 (diff) | |
| parent | fdf81e53aa57c68f330deecf4f97cfefb05f5044 (diff) | |
| download | prosody-8407f360939fe103a991641b0bf3b85e87d660b9.tar.gz prosody-8407f360939fe103a991641b0bf3b85e87d660b9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_websocket.lua')
| -rw-r--r-- | plugins/mod_websocket.lua | 8 |
1 files changed, 6 insertions, 2 deletions
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 |