prosody
ce823b32225e%3A2856e1cfbe95

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

5043:2856e1cfbe95

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Sat, 28 Jul 2012 20:59:03 +0100
parents 5031:28d56268a72d (diff) 5042:ce823b32225e (current diff)
children 5044:4ef0dbfead53
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_bosh.lua	Sat Jul 28 21:55:05 2012 +0200
+++ b/plugins/mod_bosh.lua	Sat Jul 28 20:59:03 2012 +0100
@@ -32,7 +32,6 @@
 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 @@
 			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({