# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1343505543 -3600
# Node ID 2856e1cfbe95bd6c058559bd58af0e68cd545237
# Parent  28d56268a72d3162cdc4921bf9a83070b093f70f# Parent  ce823b32225e22af00b1bfcedccf4418a1d21045
Merge with Zash

diff -r ce823b32225e -r 2856e1cfbe95 plugins/mod_bosh.lua
--- 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({