aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_c2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
commita415748985aa2ec998caabb5baf1d7f083d6076a (patch)
tree521b9634144ac84ea608dbe47a15a0bcd1951695 /plugins/mod_c2s.lua
parenteae27a73d7439930ebe9732d72b14c795b17c528 (diff)
parentb9751f2455a3a7a72c2505d3fc8296ee722726cc (diff)
downloadprosody-a415748985aa2ec998caabb5baf1d7f083d6076a.tar.gz
prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
-rw-r--r--plugins/mod_c2s.lua14
1 files changed, 0 insertions, 14 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 7a8af406..f0cdd7fb 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -174,19 +174,6 @@ local function session_close(session, reason)
end
end
-local function session_open_stream(session)
- local attr = {
- ["xmlns:stream"] = 'http://etherx.jabber.org/streams',
- xmlns = stream_callbacks.default_ns,
- version = "1.0",
- ["xml:lang"] = 'en',
- id = session.streamid or "",
- from = session.host
- };
- session.send("<?xml version='1.0'?>");
- session.send(st.stanza("stream:stream", attr):top_tag());
-end
-
module:hook_global("user-deleted", function(event)
local username, host = event.username, event.host;
local user = hosts[host].sessions[username];
@@ -234,7 +221,6 @@ function listener.onconnect(conn)
conn:setoption("keepalive", opt_keepalives);
end
- session.open_stream = session_open_stream;
session.close = session_close;
local stream = new_xmpp_stream(session, stream_callbacks);