From 2265188fcc35ffc59fd1f7b1585210d26611da17 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 1 Aug 2012 01:03:53 +0100
Subject: mod_bosh: Remove redundant code (send stream features in only one
place) (thanks Zash)
---
plugins/mod_bosh.lua | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
(limited to 'plugins')
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index f31db684..350d6b0c 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -246,7 +246,7 @@ function stream_callbacks.streamopened(context, attr)
bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid,
bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream,
- close = bosh_close_stream, dispatch_stanza = core_process_stanza,
+ close = bosh_close_stream, dispatch_stanza = core_process_stanza, notopen = true,
log = logger.init("bosh"..sid), secure = consider_bosh_secure or request.secure,
ip = get_ip_from_request(request);
};
@@ -257,10 +257,6 @@ function stream_callbacks.streamopened(context, attr)
-- Send creation response
local creating_session = true;
- local features = st.stanza("stream:features");
- hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
- fire_event("stream-features", session, features);
- table.insert(session.send_buffer, tostring(features));
local r = session.requests;
function session.send(s)
--
cgit v1.2.3