aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-28 18:50:04 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-28 18:50:04 +0100
commit96fba97cf361b0c8b3316978fa982b3c900fab14 (patch)
treea36cbc178563009693af7404da4ec390a6d1cd7a /plugins
parent19570443dda1ad2365123c2b43f6cd7cd2083219 (diff)
downloadprosody-96fba97cf361b0c8b3316978fa982b3c900fab14.tar.gz
prosody-96fba97cf361b0c8b3316978fa982b3c900fab14.zip
mod_bosh: Backout revision bc0a68cae236 (experimental bosh_auto_cork option) as I don't believe it works
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_bosh.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index f6e3095e..14445293 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -32,7 +32,6 @@ local BOSH_DEFAULT_POLLING = module:get_option_number("bosh_max_polling", 5);
local BOSH_DEFAULT_REQUESTS = module:get_option_number("bosh_max_requests", 2);
local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
-local auto_cork = module:get_option_boolean("bosh_auto_cork", false);
local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
@@ -264,7 +263,7 @@ function stream_callbacks.streamopened(context, attr)
end
--log("debug", "Sending BOSH data: %s", tostring(s));
local oldest_request = r[1];
- if oldest_request and (not(auto_cork) or waiting_requests[oldest_request]) then
+ if oldest_request then
log("debug", "We have an open request, so sending on that");
oldest_request.headers = default_headers;
oldest_request:send(t_concat({